diff options
| author | Hannes Petermaier <oe5hpm@oevsv.at> | 2015-08-25 12:17:59 +0200 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2015-10-28 14:44:04 -0500 |
| commit | 214dc1da4aa90c40e653c4daa097290fd61b3f10 (patch) | |
| tree | 06d6a2a10b0f8194492fb3542b5f284cbbc98d55 | |
| parent | f5fb734672f3fc78f63ed6a14cbdca2251ba3415 (diff) | |
net: bootp fix vci string on SPL-Boot
If CONFIG_CMD_DHCP is enabled, the vci (vendor-class-identifier) string
isn't inserted into the bootp-packet during SPL stage because the
CONFIG_BOOTP_VCI_STRING
instead
CONFIG_SPL_NET_VCI_STRING
We fix this with testing for CONFIG_SPL_BUILD and testing for existing
CONFIG_SPL_NET_VCI_STRING.
Signed-off-by: Hannes Schmelzer <oe5hpm@oevsv.at>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | net/bootp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bootp.c b/net/bootp.c index b2f8ad4ded..defad73d1a 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -498,7 +498,9 @@ static int dhcp_extended(u8 *e, int message_type, struct in_addr server_ip, } #endif -#ifdef CONFIG_BOOTP_VCI_STRING +#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 |