Skip to content

Commit 6c110df

Browse files
Florian Westphalgregkh
authored andcommitted
netfilter: nft_set_pipapo: remove unused arguments
[ Upstream commit 7792c1e ] 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: c4eaca2 ("netfilter: nft_set_pipapo: don't check genbit from packetpath lookups") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 725b33d commit 6c110df

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

net/netfilter/nft_set_pipapo.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,6 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set,
502502

503503
/**
504504
* pipapo_get() - Get matching element reference given key data
505-
* @net: Network namespace
506-
* @set: nftables API set representation
507505
* @m: storage containing active/existing elements
508506
* @data: Key data to be matched against existing elements
509507
* @genmask: If set, check that element is active in given genmask
@@ -516,9 +514,7 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set,
516514
*
517515
* Return: pointer to &struct nft_pipapo_elem on match, error pointer otherwise.
518516
*/
519-
static struct nft_pipapo_elem *pipapo_get(const struct net *net,
520-
const struct nft_set *set,
521-
const struct nft_pipapo_match *m,
517+
static struct nft_pipapo_elem *pipapo_get(const struct nft_pipapo_match *m,
522518
const u8 *data, u8 genmask,
523519
u64 tstamp, gfp_t gfp)
524520
{
@@ -615,7 +611,7 @@ nft_pipapo_get(const struct net *net, const struct nft_set *set,
615611
struct nft_pipapo_match *m = rcu_dereference(priv->match);
616612
struct nft_pipapo_elem *e;
617613

618-
e = pipapo_get(net, set, m, (const u8 *)elem->key.val.data,
614+
e = pipapo_get(m, (const u8 *)elem->key.val.data,
619615
nft_genmask_cur(net), get_jiffies_64(),
620616
GFP_ATOMIC);
621617
if (IS_ERR(e))
@@ -1344,7 +1340,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,
13441340
else
13451341
end = start;
13461342

1347-
dup = pipapo_get(net, set, m, start, genmask, tstamp, GFP_KERNEL);
1343+
dup = pipapo_get(m, start, genmask, tstamp, GFP_KERNEL);
13481344
if (!IS_ERR(dup)) {
13491345
/* Check if we already have the same exact entry */
13501346
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,
13661362

13671363
if (PTR_ERR(dup) == -ENOENT) {
13681364
/* Look for partially overlapping entries */
1369-
dup = pipapo_get(net, set, m, end, nft_genmask_next(net), tstamp,
1365+
dup = pipapo_get(m, end, nft_genmask_next(net), tstamp,
13701366
GFP_KERNEL);
13711367
}
13721368

@@ -1913,7 +1909,7 @@ nft_pipapo_deactivate(const struct net *net, const struct nft_set *set,
19131909
if (!m)
19141910
return NULL;
19151911

1916-
e = pipapo_get(net, set, m, (const u8 *)elem->key.val.data,
1912+
e = pipapo_get(m, (const u8 *)elem->key.val.data,
19171913
nft_genmask_next(net), nft_net_tstamp(net), GFP_KERNEL);
19181914
if (IS_ERR(e))
19191915
return NULL;

0 commit comments

Comments
 (0)