Commit 29f0f4ce authored by Yue Haibing's avatar Yue Haibing Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: Remove unused net in nf_conntrack_double_lock() 



Since commit a3efd812 ("netfilter: conntrack: move generation
seqcnt out of netns_ct") this param is unused.

Signed-off-by: default avatarYue Haibing <yuehaibing@huawei.com>
Acked-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent bf678874

net/netfilter/nf_conntrack_core.c

+5 −5
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ static void nf_conntrack_double_unlock(unsigned int h1, unsigned int h2) 
}



/* return true if we need to recompute hashes (in case hash table was resized) */

static bool nf_conntrack_double_lock(struct net *net, unsigned int h1,

				     unsigned int h2, unsigned int sequence)

static bool nf_conntrack_double_lock(unsigned int h1, unsigned int h2,

				     unsigned int sequence)

{

	h1 %= CONNTRACK_LOCKS;

	h2 %= CONNTRACK_LOCKS;
@@ -613,7 +613,7 @@ static void __nf_ct_delete_from_lists(struct nf_conn *ct) 
		reply_hash = hash_conntrack(net,

					   &ct->tuplehash[IP_CT_DIR_REPLY].tuple,

					   nf_ct_zone_id(nf_ct_zone(ct), IP_CT_DIR_REPLY));

	} while (nf_conntrack_double_lock(net, hash, reply_hash, sequence));

	} while (nf_conntrack_double_lock(hash, reply_hash, sequence));



	clean_from_lists(ct);

	nf_conntrack_double_unlock(hash, reply_hash);
@@ -890,7 +890,7 @@ nf_conntrack_hash_check_insert(struct nf_conn *ct) 
		reply_hash = hash_conntrack(net,

					   &ct->tuplehash[IP_CT_DIR_REPLY].tuple,

					   nf_ct_zone_id(nf_ct_zone(ct), IP_CT_DIR_REPLY));

	} while (nf_conntrack_double_lock(net, hash, reply_hash, sequence));

	} while (nf_conntrack_double_lock(hash, reply_hash, sequence));



	max_chainlen = MIN_CHAINLEN + get_random_u32_below(MAX_CHAINLEN);
@@ -1234,7 +1234,7 @@ __nf_conntrack_confirm(struct sk_buff *skb) 
		reply_hash = hash_conntrack(net,

					   &ct->tuplehash[IP_CT_DIR_REPLY].tuple,

					   nf_ct_zone_id(nf_ct_zone(ct), IP_CT_DIR_REPLY));

	} while (nf_conntrack_double_lock(net, hash, reply_hash, sequence));

	} while (nf_conntrack_double_lock(hash, reply_hash, sequence));



	/* We're not in hash table, and we refuse to set up related

	 * connections for unconfirmed conns.  But packet copies and