Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[powerpc.git] / net / ipv4 / ipip.c

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index eef07b0..ea398ee 100644 (file)
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -474,9 +474,6 @@ static int ipip_rcv(struct sk_buff *skb)
        struct iphdr *iph;
        struct ip_tunnel *tunnel;
 
-       if (!pskb_may_pull(skb, sizeof(struct iphdr)))
-               goto out;
-
        iph = skb->nh.iph;
 
        read_lock(&ipip_lock);
@@ -508,7 +505,6 @@ static int ipip_rcv(struct sk_buff *skb)
        }
        read_unlock(&ipip_lock);
 
-out:
        return -1;
 }