diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /net/ipv4/ipconfig.c | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'net/ipv4/ipconfig.c')
| -rw-r--r-- | net/ipv4/ipconfig.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 51e27ad67..15cdf7a6e 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -666,7 +666,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct device *dev, struct b->vendor_area[2] == 83 && b->vendor_area[3] == 99) { u8 *ext = &b->vendor_area[4]; - u8 *end = (u8 *) b + len; + u8 *end = (u8 *) b + ntohs(b->iph.tot_len); while (ext < end && *ext != 0xff) { if (*ext == 0) /* Padding */ ext++; |