Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ae27aa2 authored by Changli Gao's avatar Changli Gao Committed by Patrick McHardy
Browse files

netfilter: nf_conntrack: avoid additional compare. 



Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 9481721b

net/netfilter/nf_conntrack_core.c

+10 −4
Original line number Diff line number Diff line
@@ -511,11 +511,17 @@ static noinline int early_drop(struct net *net, unsigned int hash) 
			cnt++;

		}



		if (ct && unlikely(nf_ct_is_dying(ct) ||

				   !atomic_inc_not_zero(&ct->ct_general.use)))

		if (ct != NULL) {

			if (likely(!nf_ct_is_dying(ct) &&

				   atomic_inc_not_zero(&ct->ct_general.use)))

				break;

			else

				ct = NULL;

		if (ct || cnt >= NF_CT_EVICTION_RANGE)

		}



		if (cnt >= NF_CT_EVICTION_RANGE)

			break;



		hash = (hash + 1) % nf_conntrack_htable_size;

	}

	rcu_read_unlock();