diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-09-18 21:54:46 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-09-19 23:25:08 +0200 |
| commit | 7aabad28044f031a8ed74af18999e893c1d9d49c (patch) | |
| tree | f9216449b96cf5ac8e1d6da78b4bb52278f63ec2 /net | |
| parent | 226502e01bc7ffa79dde28604075949f8f816cfc (diff) | |
| download | talos-obmc-uboot-7aabad28044f031a8ed74af18999e893c1d9d49c.tar.gz talos-obmc-uboot-7aabad28044f031a8ed74af18999e893c1d9d49c.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |
