浏览代码

Fix behaviour if gatewayip is not set
Patch by Robin Gilks, 23 Dec 2004

Wolfgang Denk 19 年之前
父节点
当前提交
d509b81210
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 3 0
      CHANGELOG
  2. 3 1
      net/net.c

+ 3 - 0
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
 

+ 3 - 1
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;
 	}