diff mbox

[U-Boot,v2,04/18] net: Handle an empty bootp extension section

Message ID 1462454902-6093-5-git-send-email-sjg@chromium.org
State Awaiting Upstream
Delegated to: Andreas Bießmann
Headers show

Commit Message

Simon Glass May 5, 2016, 1:28 p.m. UTC 
From: Andre Renaud <andre@designa-electronics.com>

Avoid generating this section if there is nothing in it.

Signed-off-by: Andre Renaud <andre@designa-electronics.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---

Changes in v2: None

 net/bootp.c | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Andreas Bießmann June 12, 2016, 10:01 p.m. UTC | #1 
Dear Simon Glass,

Simon Glass <sjg@chromium.org> writes:
>From: Andre Renaud <andre@designa-electronics.com>
>
>Avoid generating this section if there is nothing in it.
>
>Signed-off-by: Andre Renaud <andre@designa-electronics.com>
>Signed-off-by: Simon Glass <sjg@chromium.org>
>Acked-by: Joe Hershberger <joe.hershberger@ni.com>
>---
>
>Changes in v2: None
>
> net/bootp.c | 9 +++++++++
> 1 file changed, 9 insertions(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bießmann
diff mbox

Patch

diff --git a/net/bootp.c b/net/bootp.c
index d7852db..71f09bd 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -655,6 +655,15 @@  static int bootp_extended(u8 *e)
 
 	*e++ = 255;		/* End of the list */
 
+	/*
+	 * If nothing in list, remove it altogether. Some DHCP servers get
+	 * upset by this minor faux pas and do not respond at all.
+	 */
+	if (e == start + 3) {
+		printf("*** Warning: no DHCP options requested\n");
+		e -= 3;
+	}
+
 	return e - start;
 }
 #endif