tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

netfilter: conntrack: Remove unused net in nf_conntrack_double_lock()

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

Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Yue Haibing and committed by
Pablo Neira Ayuso 29f0f4ce bf678874

+5 -5
+5 -5
net/netfilter/nf_conntrack_core.c
··· 136 136 } 137 137 138 138 /* return true if we need to recompute hashes (in case hash table was resized) */ 139 - static bool nf_conntrack_double_lock(struct net *net, unsigned int h1, 140 - unsigned int h2, unsigned int sequence) 139 + static bool nf_conntrack_double_lock(unsigned int h1, unsigned int h2, 140 + unsigned int sequence) 141 141 { 142 142 h1 %= CONNTRACK_LOCKS; 143 143 h2 %= CONNTRACK_LOCKS; ··· 613 613 reply_hash = hash_conntrack(net, 614 614 &ct->tuplehash[IP_CT_DIR_REPLY].tuple, 615 615 nf_ct_zone_id(nf_ct_zone(ct), IP_CT_DIR_REPLY)); 616 - } while (nf_conntrack_double_lock(net, hash, reply_hash, sequence)); 616 + } while (nf_conntrack_double_lock(hash, reply_hash, sequence)); 617 617 618 618 clean_from_lists(ct); 619 619 nf_conntrack_double_unlock(hash, reply_hash); ··· 890 890 reply_hash = hash_conntrack(net, 891 891 &ct->tuplehash[IP_CT_DIR_REPLY].tuple, 892 892 nf_ct_zone_id(nf_ct_zone(ct), IP_CT_DIR_REPLY)); 893 - } while (nf_conntrack_double_lock(net, hash, reply_hash, sequence)); 893 + } while (nf_conntrack_double_lock(hash, reply_hash, sequence)); 894 894 895 895 max_chainlen = MIN_CHAINLEN + get_random_u32_below(MAX_CHAINLEN); 896 896 ··· 1234 1234 reply_hash = hash_conntrack(net, 1235 1235 &ct->tuplehash[IP_CT_DIR_REPLY].tuple, 1236 1236 nf_ct_zone_id(nf_ct_zone(ct), IP_CT_DIR_REPLY)); 1237 - } while (nf_conntrack_double_lock(net, hash, reply_hash, sequence)); 1237 + } while (nf_conntrack_double_lock(hash, reply_hash, sequence)); 1238 1238 1239 1239 /* We're not in hash table, and we refuse to set up related 1240 1240 * connections for unconfirmed conns. But packet copies and