]> git.sur5r.net Git - u-boot/commitdiff
Fix DHCP protocol so U-Boot does not respond too early
authorRobin Getz <rgetz@blackfin.uclinux.org>
Tue, 15 Jul 2008 19:44:46 +0000 (21:44 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 15 Jul 2008 19:44:46 +0000 (21:44 +0200)
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>
net/bootp.c

index f48744abfd128b97c8b71172cde6c0a3b7e15f82..5121caa51baf13253905e90ed99e56102d7b01a0 100644 (file)
@@ -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