diff options
| author | Stefan Roese <sr@denx.de> | 2008-07-17 08:41:06 (GMT) |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-07-17 08:41:06 (GMT) |
| commit | 42246dacf60d5028d3a48a220ce94efcf56faec4 (patch) | |
| tree | 52613a7ee19d68700426c8e7d7504346daa0f7f3 /net/bootp.c | |
| parent | 11188d55bc16dd907451c00282e00a038f73dd62 (diff) | |
| parent | 699f05125509249072a0b865c8d35520d97cd501 (diff) | |
| download | u-boot-42246dacf60d5028d3a48a220ce94efcf56faec4.tar.xz | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'net/bootp.c')
| -rw-r--r-- | net/bootp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/bootp.c b/net/bootp.c index 3c0614c..5121caa 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; @@ -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 |