net: bootp fix vci string on SPL-Boot
PATCH 1/1 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
insteadCONFIG_SPL_NET_VCI_STRING
We fix this with testing for CONFIG_SPL_BUILD and testing for existing CONFIG_SPL_NET_VCI_STRING.
---
net/bootp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/bootp.c +3 -1
@@ -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
Signature · 1 line
1.9.1
PATCH 1/1 net: bootp fix vci string on SPL-Boot
Hi Hannes,
Quoted 11 lines · Hannes Schmelzer
If
CONFIG_CMD_DHCPis enabled, the vci (vendor-class-identifier) string isn't inserted into the bootp-packet during SPL stage because the
CONFIG_BOOTP_VCI_STRING
insteadCONFIG_SPL_NET_VCI_STRINGWe fix this with testing for
CONFIG_SPL_BUILDand testing for existingCONFIG_SPL_NET_VCI_STRING.Signed-off-by Hannes Schmelzer <[email protected]>
PATCH 1/1 net: bootp fix vci string on SPL-Boot
Hi,
just checked my upstream branch and noticed that this patch is outstanding. How about merge?
regards,
Hannes
Quoted 17 lines · Joe Hershberger
Hi Hannes,
Quoted 11 lines · Hannes Schmelzer
If
CONFIG_CMD_DHCPis enabled, the vci (vendor-class-identifier) string isn't inserted into the bootp-packet during SPL stage because the
CONFIG_BOOTP_VCI_STRING
insteadCONFIG_SPL_NET_VCI_STRINGWe fix this with testing for
CONFIG_SPL_BUILDand testing for existingCONFIG_SPL_NET_VCI_STRING.Signed-off-by Hannes Schmelzer <[email protected]>Acked-by Joe Hershberger <[email protected]>
PATCH 1/1 net: bootp fix vci string on SPL-Boot
Hi Hannes,
Quoted 4 lines · Hannes Schmelzer
Hi,
just checked my upstream branch and noticed that this patch is outstanding. How about merge?
Do you think this is a critical bug fix? I was planning to wait for next release since the patch came after the merge window.
Quoted 27 lines
regards,
HannesQuoted 20 lines · Joe Hershberger
Hi Hannes,
Quoted 4 lines · Hannes Schmelzer
If
CONFIG_CMD_DHCPis enabled, the vci (vendor-class-identifier) string isn't inserted into the bootp-packet during SPL stage because theQuoted 8 lines
CONFIG_BOOTP_VCI_STRING
insteadCONFIG_SPL_NET_VCI_STRINGWe fix this with testing for
CONFIG_SPL_BUILDand testing for existingCONFIG_SPL_NET_VCI_STRING.Signed-off-by Hannes Schmelzer <[email protected]>Acked-by Joe Hershberger <[email protected]>
[U-Boot] Antwort: Re: [PATCH] net: bootp fix vci string on SPL-Boot
Quoted 1 line
Hi Hannes,
Hi Joe,
Quoted 5 lines
Quoted 3 lines · Hannes Schmelzer
Hi,
just checked my upstream branch and noticed that this patch is
outstanding.
Quoted 4 lines
Quoted 1 line
How about merge?
Do you think this is a critical bug fix? I was planning to wait for next release since the patch came after the merge window.
Absolutely not critical. no problem to wait for next release.
Quoted 11 lines
Quoted 11 lines
regards,
HannesQuoted 4 lines · Joe Hershberger
Hi Hannes,
On Tue, Aug 25, 2015 at 5:17 AM, Hannes Schmelzer <[email protected]>
Quoted 2 lines · wrote:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
If
CONFIG_CMD_DHCPis enabled, the vci (vendor-class-identifier)
string
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
isn't inserted into the bootp-packet during SPL stage because the
CONFIG_BOOTP_VCI_STRING
insteadCONFIG_SPL_NET_VCI_STRINGWe fix this with testing for
CONFIG_SPL_BUILDand testing for
existing
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
CONFIG_SPL_NET_VCI_STRING.Signed-off-by Hannes Schmelzer <[email protected]>Acked-by Joe Hershberger <[email protected]>
PATCH 1/1 net: bootp fix vci string on SPL-Boot
In reply to Hannes SchmelzerQuoted 12 lines · Hannes Schmelzer
If
CONFIG_CMD_DHCPis enabled, the vci (vendor-class-identifier) string isn't inserted into the bootp-packet during SPL stage because the
CONFIG_BOOTP_VCI_STRING
insteadCONFIG_SPL_NET_VCI_STRINGWe fix this with testing for
CONFIG_SPL_BUILDand testing for existingCONFIG_SPL_NET_VCI_STRING.Signed-off-by Hannes Schmelzer <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150825/b366c644/attachment.sig>
PATCH 1/1 net: bootp fix vci string on SPL-Boot
In reply to Hannes SchmelzerQuoted 11 lines · Hannes Schmelzer
If
CONFIG_CMD_DHCPis enabled, the vci (vendor-class-identifier) string isn't inserted into the bootp-packet during SPL stage because the
CONFIG_BOOTP_VCI_STRING
insteadCONFIG_SPL_NET_VCI_STRINGWe fix this with testing for
CONFIG_SPL_BUILDand testing for existingCONFIG_SPL_NET_VCI_STRING.Signed-off-by Hannes Schmelzer <[email protected]>
Applied to u-boot-net/master, thanks!
-Joe