@@ -502,8 +502,6 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set,
502
502
503
503
/**
504
504
* pipapo_get() - Get matching element reference given key data
505
- * @net: Network namespace
506
- * @set: nftables API set representation
507
505
* @m: storage containing active/existing elements
508
506
* @data: Key data to be matched against existing elements
509
507
* @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,
516
514
*
517
515
* Return: pointer to &struct nft_pipapo_elem on match, error pointer otherwise.
518
516
*/
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 ,
522
518
const u8 * data , u8 genmask ,
523
519
u64 tstamp , gfp_t gfp )
524
520
{
@@ -615,7 +611,7 @@ nft_pipapo_get(const struct net *net, const struct nft_set *set,
615
611
struct nft_pipapo_match * m = rcu_dereference (priv -> match );
616
612
struct nft_pipapo_elem * e ;
617
613
618
- e = pipapo_get (net , set , m , (const u8 * )elem -> key .val .data ,
614
+ e = pipapo_get (m , (const u8 * )elem -> key .val .data ,
619
615
nft_genmask_cur (net ), get_jiffies_64 (),
620
616
GFP_ATOMIC );
621
617
if (IS_ERR (e ))
@@ -1344,7 +1340,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,
1344
1340
else
1345
1341
end = start ;
1346
1342
1347
- dup = pipapo_get (net , set , m , start , genmask , tstamp , GFP_KERNEL );
1343
+ dup = pipapo_get (m , start , genmask , tstamp , GFP_KERNEL );
1348
1344
if (!IS_ERR (dup )) {
1349
1345
/* Check if we already have the same exact entry */
1350
1346
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,
1366
1362
1367
1363
if (PTR_ERR (dup ) == - ENOENT ) {
1368
1364
/* 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 ,
1370
1366
GFP_KERNEL );
1371
1367
}
1372
1368
@@ -1913,7 +1909,7 @@ nft_pipapo_deactivate(const struct net *net, const struct nft_set *set,
1913
1909
if (!m )
1914
1910
return NULL ;
1915
1911
1916
- e = pipapo_get (net , set , m , (const u8 * )elem -> key .val .data ,
1912
+ e = pipapo_get (m , (const u8 * )elem -> key .val .data ,
1917
1913
nft_genmask_next (net ), nft_net_tstamp (net ), GFP_KERNEL );
1918
1914
if (IS_ERR (e ))
1919
1915
return NULL ;
0 commit comments