Commit 464c3855 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: make netns address part of nat bysrc hash 



Will be needed soon when we place all in the same hash table.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent bbe848ec

net/netfilter/nf_nat_core.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ EXPORT_SYMBOL(nf_xfrm_me_harder); 




/* We keep an extra hash for each conntrack, for fast searching. */

/* We keep an extra hash for each conntrack, for fast searching. */

static inline unsigned int

static inline unsigned int

hash_by_src(const struct net *net, const struct nf_conntrack_tuple *tuple)

hash_by_src(const struct net *n, const struct nf_conntrack_tuple *tuple)

{

{

	unsigned int hash;

	unsigned int hash;
@@ -126,9 +126,9 @@ hash_by_src(const struct net *net, const struct nf_conntrack_tuple *tuple) 




	/* Original src, to ensure we map it consistently if poss. */

	/* Original src, to ensure we map it consistently if poss. */

	hash = jhash2((u32 *)&tuple->src, sizeof(tuple->src) / sizeof(u32),

	hash = jhash2((u32 *)&tuple->src, sizeof(tuple->src) / sizeof(u32),

		      tuple->dst.protonum ^ nf_nat_hash_rnd);

		      tuple->dst.protonum ^ nf_nat_hash_rnd ^ net_hash_mix(n));





	return reciprocal_scale(hash, net->ct.nat_htable_size);

	return reciprocal_scale(hash, n->ct.nat_htable_size);

}

}





/* Is this tuple already taken? (not by us) */

/* Is this tuple already taken? (not by us) */