summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMichael Zaidman <michael.zaidman@gmail.com>2009-07-14 23:37:12 +0300
committerBen Warren <biggerbadderben@gmail.com>2009-07-22 22:53:45 -0700
commit09133f8580f0106429ba3600f1855bd3577ae58b (patch)
tree17f78d3b86f5e90dcf88dd099bdfd5ea5d0c00e4 /net
parent443ce4ac9d1138ae5ae6863b2d40a96fd6edf523 (diff)
DHCP regression on 2009-06
Fixed the DHCP/BOOTP/RARP regression introduced in u-boot-2009.06 by initializing our IP addr to 0 in order to accept any IP addr assigned to us by the DHCP/BOOTP/RARP server. Ack-by: Robin Getz <rgetz@blackfin.uclinux.org> Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'net')
-rw-r--r--net/net.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/net.c b/net/net.c
index 4bbe5313c3e..7ce947db300 100644
--- a/net/net.c
+++ b/net/net.c
@@ -394,17 +394,20 @@ restart:
#if defined(CONFIG_CMD_DHCP)
case DHCP:
BootpTry = 0;
+ NetOurIP = 0;
DhcpRequest(); /* Basically same as BOOTP */
break;
#endif
case BOOTP:
BootpTry = 0;
+ NetOurIP = 0;
BootpRequest ();
break;
case RARP:
RarpTry = 0;
+ NetOurIP = 0;
RarpRequest ();
break;
#if defined(CONFIG_CMD_PING)