From b64f190b7a34224df09b559ca111eb1b733f00ad Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Mon, 14 Jul 2008 15:06:35 +0200 Subject: Fix printf() format issues with sizeof_t types by using %zu Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Wolfgang Denk --- net/bootp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/bootp.c') diff --git a/net/bootp.c b/net/bootp.c index 3c0614c..f48744a 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -313,7 +313,7 @@ BootpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len) Bootp_t *bp; char *s; - debug ("got BOOTP packet (src=%d, dst=%d, len=%d want_len=%d)\n", + debug ("got BOOTP packet (src=%d, dst=%d, len=%d want_len=%zu)\n", src, dest, len, sizeof (Bootp_t)); bp = (Bootp_t *)pkt; -- cgit v1.1 From 0328ef0edfe950f0b7b8b368dae482531506b74a Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Tue, 15 Jul 2008 21:44:46 +0200 Subject: 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 Acked-by: Ben Warren Signed-off-by: Wolfgang Denk --- net/bootp.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'net/bootp.c') diff --git a/net/bootp.c b/net/bootp.c index f48744a..5121caa 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 -- cgit v1.1