MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-23 07:23:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

netfilter: nft_set_pipapo: remove unused arguments

Browse Source 
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>
This commit is contained in:
Florian Westphal 2025-07-09 19:05:12 +02:00 committed by Pablo Neira Ayuso
parent bc8c43adfd
commit 7792c1e030
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/netfilter/nft_set_pipapo.c
View File

@ -502,8 +502,6 @@ out:
/** /**
* pipapo_get() - Get matching element reference given key data * pipapo_get() - Get matching element reference given key data
* @net: Network namespace
* @set: nftables API set representation
* @m: storage containing active/existing elements * @m: storage containing active/existing elements
* @data: Key data to be matched against existing elements * @data: Key data to be matched against existing elements
* @genmask: If set, check that element is active in given genmask * @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. * Return: pointer to &struct nft_pipapo_elem on match, error pointer otherwise.
*/ */
static struct nft_pipapo_elem *pipapo_get(const struct net *net, static struct nft_pipapo_elem *pipapo_get(const struct nft_pipapo_match *m,
const struct nft_set *set,
const struct nft_pipapo_match *m,
const u8 *data, u8 genmask, const u8 *data, u8 genmask,
u64 tstamp, gfp_t gfp) 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_match *m = rcu_dereference(priv->match);
struct nft_pipapo_elem *e; 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(), nft_genmask_cur(net), get_jiffies_64(),
GFP_ATOMIC); GFP_ATOMIC);
if (IS_ERR(e)) if (IS_ERR(e))
@ -1345,7 +1341,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,
else else
end = start; 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)) { if (!IS_ERR(dup)) {
/* Check if we already have the same exact entry */ /* Check if we already have the same exact entry */
const struct nft_data *dup_key, *dup_end; const struct nft_data *dup_key, *dup_end;
@ -1367,7 +1363,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,
if (PTR_ERR(dup) == -ENOENT) { if (PTR_ERR(dup) == -ENOENT) {
/* Look for partially overlapping entries */ /* 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); GFP_KERNEL);
} }
@ -1914,7 +1910,7 @@ nft_pipapo_deactivate(const struct net *net, const struct nft_set *set,
if (!m) if (!m)
return NULL; 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); nft_genmask_next(net), nft_net_tstamp(net), GFP_KERNEL);
if (IS_ERR(e)) if (IS_ERR(e))
return NULL; return NULL;