From 296e88d16d923eba8545fe4ea58559e3dd4b0ea2 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Mon, 9 Apr 2012 16:32:16 +0200 Subject: [PATCH] --- yaml --- r: 299015 b: refs/heads/master c: 8430eac2f6a3c2adce22d490e2ab8bb50d59077a h: refs/heads/master i: 299013: 7c7813e744d1d302d2b7c87042226324c6e8524d 299011: e0eeaf0578841a2ad4e9bfb7d83b478f95f37695 299007: b54b3d7783de977fee86ff27b40fa62a289f2ead v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7040b2ad5df8..92b566689fc9 100644 --- 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 index de9da21113a1..750b06afd20e 100644 --- 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;