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>

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index fbd901b3b7cee47f7864160d967e179e8ef17082..344f88295976d728727d67fb0e24070ba527497b 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -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