From fba5090512968f4da1f95feb23f687a9128c416c Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 7 Oct 2003 03:37:50 -0700 Subject: [PATCH] Fix up recent net/ipv4/ipconfig.c typo breakage. --- net/ipv4/ipconfig.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 6085ddad0440c..a87a00738699c 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -417,7 +417,7 @@ ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) return NET_RX_DROP; - if (!pskb_may_pull(skb, sizeof(arphdr))) + if (!pskb_may_pull(skb, sizeof(struct arphdr))) goto drop; /* Basic sanity checks can be done without the lock. */ @@ -438,7 +438,7 @@ ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt goto drop; if (!pskb_may_pull(skb, - sizeof(arphdr) + + sizeof(struct arphdr) + (2 * dev->addr_len) + (2 * 4))) goto drop; @@ -855,7 +855,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str if (b->udph.source != htons(67) || b->udph.dest != htons(68)) goto drop; - if (ntohs(h->tot_len) < ntohs(b->udhp.len) + sizeof(struct iphdr)) + if (ntohs(h->tot_len) < ntohs(b->udph.len) + sizeof(struct iphdr)) goto drop; len = ntohs(b->udph.len) - sizeof(struct udphdr); -- 2.53.0