Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[thirdparty/kernel/linux.git] / net / netfilter / nf_conntrack_core.c

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index c63868666bd9e5819bdfef9986ab9d46d0e7475f..7ac20750c127b5e537b7d3019717ca98d007fead 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1440,8 +1440,6 @@ static bool gc_worker_can_early_drop(const struct nf_conn *ct)
        const struct nf_conntrack_l4proto *l4proto;
        u8 protonum = nf_ct_protonum(ct);
 
-       if (test_bit(IPS_OFFLOAD_BIT, &ct->status) && protonum != IPPROTO_UDP)
-               return false;
        if (!test_bit(IPS_ASSURED_BIT, &ct->status))
                return true;
 
@@ -2024,7 +2022,7 @@ repeat:
                        goto repeat;
 
                NF_CT_STAT_INC_ATOMIC(state->net, invalid);
-               if (ret == -NF_DROP)
+               if (ret == NF_DROP)
                        NF_CT_STAT_INC_ATOMIC(state->net, drop);
 
                ret = -ret;