diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:01:24 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:01:24 +0200 |
| commit | 658cc34395e3780dc46d6ffdc61c95130d362661 (patch) | |
| tree | 2a56eb0438b75e2ddc44970ff8be4d7af97e65fa /net/bootp.c | |
| parent | 873c1d746ea291cdf0b73dbcc1f7f289984472f2 (diff) | |
| download | barebox-658cc34395e3780dc46d6ffdc61c95130d362661.tar.gz barebox-658cc34395e3780dc46d6ffdc61c95130d362661.tar.xz | |
svn_rev_118
thousands of things
Diffstat (limited to 'net/bootp.c')
| -rw-r--r-- | net/bootp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bootp.c b/net/bootp.c index 8b7e923c05..18065b8bd2 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -128,7 +128,7 @@ static int truncate_sz (const char *name, int maxlen, int curlen) return (curlen); } -#if !(CONFIG_COMMANDS & CFG_CMD_DHCP) +#ifndef CONFIG_NET_DHCP static void BootpVendorFieldProcess (u8 * ext) { @@ -285,6 +285,7 @@ static void BootpVendorProcess (u8 * ext, int size) /* * Handle a BOOTP received packet. */ + static void BootpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len) { @@ -821,8 +822,6 @@ DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len) debug ("DHCP State: REQUESTING\n"); if ( DhcpMessageType((u8 *)bp->bp_vend) == DHCP_ACK ) { - char *s; - 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 */ |