From: Robin Getz <rgetz@blackfin.uclinux.org>
Date: Tue, 15 Jul 2008 19:44:46 +0000 (+0200)
Subject: Fix DHCP protocol so U-Boot does not respond too early
X-Git-Tag: v1.3.4-rc1~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0328ef0edfe950f0b7b8b368dae482531506b74a;p=oweals%2Fu-boot.git

Fix DHCP protocol so U-Boot does not respond too early
on the network with it's offered IP number; it should not reply until
after it has received a DHCP ACK message. Also ensures that U-Boot
does it's DHCPREQUEST as broadcast (per RFC 2131).

Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
---

diff --git a/net/bootp.c b/net/bootp.c
index f48744abfd..5121caa51b 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -924,8 +924,6 @@ DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
 			if (NetReadLong((ulong*)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC))
 				DhcpOptionsProcess((u8 *)&bp->bp_vend[4], bp);
 
-			BootpCopyNetParams(bp); /* Store net params from reply */
-
 			NetSetTimeout(TIMEOUT * CFG_HZ, BootpTimeout);
 			DhcpSendRequestPkt(bp);
 #ifdef CFG_BOOTFILE_PREFIX