commit 2c00e099fe77b014dd094a49113e2c6ce8a24a16
author Joe Hershberger <joe.hershberger@ni.com> Wed May 23 07:59:19 2012 +0000
committer Joe Hershberger <joe.hershberger@ni.com> Wed May 23 17:53:05 2012 -0500
tree 8fd179098f867dbdf817881fa3fc350c0606c4e5
parent 1752f0fdc7a3b914f6b651f68cb59dde102c9c92

net: Add option CONFIG_BOOTP_MAY_FAIL

This is useful if you want to look for a DHCP server, but try some
other settings if not available.

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

net/bootp.c

diff --git a/net/bootp.c b/net/bootp.c
index 7e24b66..0f0867b 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -326,8 +326,13 @@
 BootpTimeout(void)
 {
 	if (BootpTry >= TIMEOUT_COUNT) {
+#ifdef CONFIG_BOOTP_MAY_FAIL
+		puts("\nRetry count exceeded\n");
+		NetSetState(NETLOOP_FAIL);
+#else
 		puts("\nRetry count exceeded; starting again\n");
 		NetStartAgain();
+#endif
 	} else {
 		NetSetTimeout(TIMEOUT, BootpTimeout);
 		BootpRequest();