netfilter: nft_set_pipapo: remove unused arguments

[ Upstream commit 7792c1e03054440c60d4bce0c06a31c134601997 ]

They are not used anymore, so remove them.

Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Stable-dep-of: c4eaca2e1052 ("netfilter: nft_set_pipapo: don't check genbit from packetpath lookups")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
index 9e4e25f2458f99823337e89f3f488755da82abe0..9ac48e6b4332c5faeee36281924214f58a7cdeb0 100644 (file)
--- a/net/netfilter/nft_set_pipapo.c
+++ b/net/netfilter/nft_set_pipapo.c
@@ -502,8 +502,6 @@ out:
 
 /**
  * pipapo_get() - Get matching element reference given key data
- * @net:       Network namespace
- * @set:       nftables API set representation
  * @m:         storage containing active/existing elements
  * @data:      Key data to be matched against existing elements
  * @genmask:   If set, check that element is active in given genmask
@@ -516,9 +514,7 @@ out:
  *
  * Return: pointer to &struct nft_pipapo_elem on match, error pointer otherwise.
  */
-static struct nft_pipapo_elem *pipapo_get(const struct net *net,
-                                         const struct nft_set *set,
-                                         const struct nft_pipapo_match *m,
+static struct nft_pipapo_elem *pipapo_get(const struct nft_pipapo_match *m,
                                          const u8 *data, u8 genmask,
                                          u64 tstamp, gfp_t gfp)
 {
@@ -615,7 +611,7 @@ nft_pipapo_get(const struct net *net, const struct nft_set *set,
        struct nft_pipapo_match *m = rcu_dereference(priv->match);
        struct nft_pipapo_elem *e;
 
-       e = pipapo_get(net, set, m, (const u8 *)elem->key.val.data,
+       e = pipapo_get(m, (const u8 *)elem->key.val.data,
                       nft_genmask_cur(net), get_jiffies_64(),
                       GFP_ATOMIC);
        if (IS_ERR(e))
@@ -1344,7 +1340,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,
        else
                end = start;
 
-       dup = pipapo_get(net, set, m, start, genmask, tstamp, GFP_KERNEL);
+       dup = pipapo_get(m, start, genmask, tstamp, GFP_KERNEL);
        if (!IS_ERR(dup)) {
                /* Check if we already have the same exact entry */
                const struct nft_data *dup_key, *dup_end;
@@ -1366,7 +1362,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,
 
        if (PTR_ERR(dup) == -ENOENT) {
                /* Look for partially overlapping entries */
-               dup = pipapo_get(net, set, m, end, nft_genmask_next(net), tstamp,
+               dup = pipapo_get(m, end, nft_genmask_next(net), tstamp,
                                 GFP_KERNEL);
        }
 
@@ -1913,7 +1909,7 @@ nft_pipapo_deactivate(const struct net *net, const struct nft_set *set,
        if (!m)
                return NULL;
 
-       e = pipapo_get(net, set, m, (const u8 *)elem->key.val.data,
+       e = pipapo_get(m, (const u8 *)elem->key.val.data,
                       nft_genmask_next(net), nft_net_tstamp(net), GFP_KERNEL);
        if (IS_ERR(e))
                return NULL;