summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorRobin Getz <rgetz@blackfin.uclinux.org>2008-07-15 21:44:46 +0200
committerWolfgang Denk <wd@denx.de>2008-07-15 21:44:46 +0200
commit0328ef0edfe950f0b7b8b368dae482531506b74a (patch)
tree435dc02bb53f784c7e2187ab9b9e69227622e33c /net
parent7288f972fcaee14a9741cb08c8688a23874b4a2e (diff)
downloadblackbird-obmc-uboot-0328ef0edfe950f0b7b8b368dae482531506b74a.tar.gz
blackbird-obmc-uboot-0328ef0edfe950f0b7b8b368dae482531506b74a.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/bootp.c2
1 files changed, 0 insertions, 2 deletions
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
OpenPOWER on IntegriCloud