---

yaml --- r: 351470 b: refs/heads/master c: 1ad759d h: refs/heads/master v: v3
git-mirror · Jan 18, 2013 · 2ba004f · 2ba004f
1 parent 77c73a6
commit 2ba004f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 115b0aa6b444e8dd89b7f67b77b8c472763fbc1a
+refs/heads/master: 1ad759d8479b4b28f2a6c874d380066cf987b341
diff --git a/trunk/net/ipv6/sit.c b/trunk/net/ipv6/sit.c
@@ -592,15 +592,10 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
 
 static int ipip6_rcv(struct sk_buff *skb)
 {
-	const struct iphdr *iph;
+	const struct iphdr *iph = ip_hdr(skb);
 	struct ip_tunnel *tunnel;
 	int err;
 
-	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
-		goto out;
-
-	iph = ip_hdr(skb);
-
 	tunnel = ipip6_tunnel_lookup(dev_net(skb->dev), skb->dev,
 				     iph->saddr, iph->daddr);
 	if (tunnel != NULL) {