Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04166f48 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

Revert "netfilter: nf_tables: add flush field to struct nft_set_iter" 



This reverts commit 1f48ff6c.

This patch is not required anymore now that we keep a dummy list of
set elements in the bitmap set implementation, so revert this before
we forget this code has no clients.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent e920dde5

include/net/netfilter/nf_tables.h

+0 −1
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ struct nft_set_elem { 
struct nft_set;

struct nft_set_iter {

	u8		genmask;

	bool		flush;

	unsigned int	count;

	unsigned int	skip;

	int		err;

net/netfilter/nf_tables_api.c

+0 −4
Original line number Diff line number Diff line
@@ -3145,7 +3145,6 @@ int nf_tables_bind_set(const struct nft_ctx *ctx, struct nft_set *set, 
		iter.count	= 0;

		iter.err	= 0;

		iter.fn		= nf_tables_bind_check_setelem;

		iter.flush	= false;



		set->ops->walk(ctx, set, &iter);

		if (iter.err < 0)
@@ -3399,7 +3398,6 @@ static int nf_tables_dump_set(struct sk_buff *skb, struct netlink_callback *cb) 
	args.iter.count		= 0;

	args.iter.err		= 0;

	args.iter.fn		= nf_tables_dump_setelem;

	args.iter.flush		= false;

	set->ops->walk(&ctx, set, &args.iter);



	nla_nest_end(skb, nest);
@@ -3963,7 +3961,6 @@ static int nf_tables_delsetelem(struct net *net, struct sock *nlsk, 
		struct nft_set_iter iter = {

			.genmask	= genmask,

			.fn		= nft_flush_set,

			.flush		= true,

		};

		set->ops->walk(&ctx, set, &iter);
@@ -5114,7 +5111,6 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx, 
			iter.count	= 0;

			iter.err	= 0;

			iter.fn		= nf_tables_loop_check_setelem;

			iter.flush	= false;



			set->ops->walk(ctx, set, &iter);

			if (iter.err < 0)