Commit 7792c1e0 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nft_set_pipapo: remove unused arguments 



They are not used anymore, so remove them.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Reviewed-by: default avatarStefano Brivio <sbrivio@redhat.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent bc8c43ad

net/netfilter/nft_set_pipapo.c

+5 −9
Original line number Diff line number Diff line
@@ -502,8 +502,6 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, 


/**

 * 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 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, 
 *

 * 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))
@@ -1345,7 +1341,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;
@@ -1367,7 +1363,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);

	}
@@ -1914,7 +1910,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;