---

yaml --- r: 299015 b: refs/heads/master c: 8430eac h: refs/heads/master i: 299013: 7c7813e 299011: e0eeaf0 299007: b54b3d7 v: v3
git-mirror · Apr 9, 2012 · 296e88d · 296e88d
1 parent d0a57e0
commit 296e88d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95ad2f873d5d404dc9ebc2377de0b762346346c0
+refs/heads/master: 8430eac2f6a3c2adce22d490e2ab8bb50d59077a
diff --git a/trunk/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/trunk/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -74,12 +74,12 @@ static int ipv4_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
 
 	iph = skb_header_pointer(skb, nhoff, sizeof(_iph), &_iph);
 	if (iph == NULL)
-		return -NF_DROP;
+		return -NF_ACCEPT;
 
 	/* Conntrack defragments packets, we might still see fragments
 	 * inside ICMP packets though. */
 	if (iph->frag_off & htons(IP_OFFSET))
-		return -NF_DROP;
+		return -NF_ACCEPT;
 
 	*dataoff = nhoff + (iph->ihl << 2);
 	*protonum = iph->protocol;