diff options
| author | Alexander Graf <agraf@suse.de> | 2016-05-06 21:01:02 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-27 10:01:11 -0400 |
| commit | 4570a993d5f330ab05081f7b1070da9bcde9289e (patch) | |
| tree | f2b5af9ae5ab11b6b8f7e701ef520dc36c8b8d34 /net | |
| parent | 0efe1bcf5c2ce89d7c2467550e2823d7f95733e0 (diff) | |
| download | blackbird-obmc-uboot-4570a993d5f330ab05081f7b1070da9bcde9289e.tar.gz blackbird-obmc-uboot-4570a993d5f330ab05081f7b1070da9bcde9289e.zip | |
bootp: Move vendor class identifier set to function
Both the dhcp as well as the bootp case add vendor class identifier
parameters into their packets. Let's move that into a separate function
to make overlaying easier.
Signed-off-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/net/bootp.c b/net/bootp.c index d91b3076b3..d718e35b63 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -411,6 +411,17 @@ static void bootp_timeout_handler(void) e += vci_strlen; \ } while (0) +static u8 *add_vci(u8 *e) +{ +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_NET_VCI_STRING) + put_vci(e, CONFIG_SPL_NET_VCI_STRING); +#elif defined(CONFIG_BOOTP_VCI_STRING) + put_vci(e, CONFIG_BOOTP_VCI_STRING); +#endif + + return e; +} + /* * Initialize BOOTP extension fields in the request. */ @@ -508,11 +519,7 @@ static int dhcp_extended(u8 *e, int message_type, struct in_addr server_ip, } #endif -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_NET_VCI_STRING) - put_vci(e, CONFIG_SPL_NET_VCI_STRING); -#elif defined(CONFIG_BOOTP_VCI_STRING) - put_vci(e, CONFIG_BOOTP_VCI_STRING); -#endif + e = add_vci(e); #if defined(CONFIG_BOOTP_VENDOREX) x = dhcp_vendorex_prep(e); @@ -598,14 +605,7 @@ static int bootp_extended(u8 *e) *e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff; #endif -#if defined(CONFIG_BOOTP_VCI_STRING) || \ - (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_NET_VCI_STRING)) -#ifdef CONFIG_SPL_BUILD - put_vci(e, CONFIG_SPL_NET_VCI_STRING); -#else - put_vci(e, CONFIG_BOOTP_VCI_STRING); -#endif -#endif + add_vci(e); #if defined(CONFIG_BOOTP_SUBNETMASK) *e++ = 1; /* Subnet mask request */ |
