From d5837603e3085f322cddb1d59bb28e93f5339ab5 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 30 Jun 2006 13:35:46 -0700
Subject: [PATCH] --- yaml --- r: 31522 b: refs/heads/master c:
 2889139a6acd2945f6143eb85f7dc2a22a352e1a h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv6/ip6_input.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d0a077ad9a5b..8c746ee97f43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd7271feba61d5dc0fab1cb5365db9926d35ea3a
+refs/heads/master: 2889139a6acd2945f6143eb85f7dc2a22a352e1a
diff --git a/trunk/net/ipv6/ip6_input.c b/trunk/net/ipv6/ip6_input.c
index aceee252503d..df8f051c0fce 100644
--- a/trunk/net/ipv6/ip6_input.c
+++ b/trunk/net/ipv6/ip6_input.c
@@ -84,14 +84,9 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
 	 */
 	IP6CB(skb)->iif = skb->dst ? ((struct rt6_info *)skb->dst)->rt6i_idev->dev->ifindex : dev->ifindex;
 
-	if (skb->len < sizeof(struct ipv6hdr))
+	if (unlikely(!pskb_may_pull(skb, sizeof(*hdr))))
 		goto err;
 
-	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) {
-		IP6_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
-		goto drop;
-	}
-
 	hdr = skb->nh.ipv6h;
 
 	if (hdr->version != 6)