summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-03-12 01:13:30 +0100
committerWolfgang Denk <wd@pollux.denx.de>2006-03-12 01:13:30 +0100
commitd509b81210e8126d8f953fda419f93c8065e314a (patch)
treea6dd84ad319d1995c1e9c037d8c6cfdb4a915453
parent84ef51a632063e8cb57b2e9a4252497512831ffe (diff)
downloadu-boot-imx-d509b81210e8126d8f953fda419f93c8065e314a.zip
u-boot-imx-d509b81210e8126d8f953fda419f93c8065e314a.tar.gz
u-boot-imx-d509b81210e8126d8f953fda419f93c8065e314a.tar.bz2
Fix behaviour if gatewayip is not set
Patch by Robin Gilks, 23 Dec 2004
-rw-r--r--CHANGELOG3
-rw-r--r--net/net.c4
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fa3f745..db50b57 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Fix behaviour if gatewayip is not set
+ Patch by Robin Gilks, 23 Dec 2004
+
* Fix cleanup for netstart board.
Remove build results from repository
diff --git a/net/net.c b/net/net.c
index 37c5fb6..5062037 100644
--- a/net/net.c
+++ b/net/net.c
@@ -222,8 +222,10 @@ void ArpRequest (void)
(NetOurIP & NetOurSubnetMask)) {
if (NetOurGatewayIP == 0) {
puts ("## Warning: gatewayip needed but not set\n");
+ NetArpWaitReplyIP = NetArpWaitPacketIP;
+ } else {
+ NetArpWaitReplyIP = NetOurGatewayIP;
}
- NetArpWaitReplyIP = NetOurGatewayIP;
} else {
NetArpWaitReplyIP = NetArpWaitPacketIP;
}