diff options
| author | Jason Liu <r64343@freescale.com> | 2010-11-14 12:23:09 +0800 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-11-14 23:29:29 +0100 |
| commit | 258ccd68170b7279ec7d4805c7b914c90374e711 (patch) | |
| tree | 65294dbbf384b7b2fd5b458e9c8457d65ee679cd /net | |
| parent | 6d1d51b32b9dc26be42ab95a61346050f9de7665 (diff) | |
net: Fix potential empty DHCP Parameter Request List
Can't get IP address with dhcp due to the dhcp server not
allow the empty param list request under some network env
This patch is based on Gray Remlin's initial patch.
Signed-off-by: Jason Liu <r64343@freescale.com>
Signed-off-by: Gray Remlin <g_remlin@rocketmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bootp.c b/net/bootp.c index e679f8b7f87..1a717867d48 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -456,6 +456,10 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R *e++ = 42; *cnt += 1; #endif + /* no options, so back up to avoid sending an empty request list */ + if (*cnt == 0) + e -= 2; + *e++ = 255; /* End of the list */ /* Pad to minimal length */ |