From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sun, 18 Sep 2011 21:54:46 +0000 (+0000)
Subject: net/bootp.c: fix tftp load if autoload environment var isn't set
X-Git-Tag: v2011.09-rc2~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7aabad28044f031a8ed74af18999e893c1d9d49c;p=u-boot

net/bootp.c: fix tftp load if autoload environment var isn't set

Commit 093498669 (Put common autoload code into auto_load() function)
broke handling of autoload environment variable not being set.
The bootp/dhcp code will just keep on requesting IP address forever
and never start TFTP download.

Fix it by moving TftpStart() outside the conditional like it was before.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Simon Glass <sjg@chromium.org>
---

diff --git a/net/bootp.c b/net/bootp.c
index 3db08ea2f3..a003c422bd 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -164,8 +164,8 @@ static void auto_load(void)
 			return;
 		}
 #endif
-	TftpStart();
 	}
+	TftpStart();
 }
 
 #if !defined(CONFIG_CMD_DHCP)