netfilter: nft_set_pipapo: no need to call pipapo_deactivate() from flush

ummakynes · ummakynes · commit 26cec9d4144e · 2023-10-24T13:16:30.000+02:00
Use the element object that is already offered instead.

Signed-off-by: Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;
diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
@@ -1814,8 +1814,9 @@ static bool nft_pipapo_flush(const struct net *net, const struct nft_set *set,
 {
 	struct nft_pipapo_elem *e = elem;
 
-	return pipapo_deactivate(net, set, (const u8 *)nft_set_ext_key(&e->ext),
-				 &e->ext);
+	nft_set_elem_change_active(net, set, &e->ext);
+
+	return true;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1814,8 +1814,9 @@ static bool nft_pipapo_flush(const struct net net, const struct nft_set set,`
`1814`	`1814`	`{`
`1815`	`1815`	`struct nft_pipapo_elem *e = elem;`
`1816`	`1816`
`1817`		`- return pipapo_deactivate(net, set, (const u8 *)nft_set_ext_key(&e->ext),`
`1818`		`- &e->ext);`
	`1817`	`+ nft_set_elem_change_active(net, set, &e->ext);`
	`1818`	`+`
	`1819`	`+ return true;`
`1819`	`1820`	`}`
`1820`	`1821`
`1821`	`1822`	`/**`