diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-03-13 08:24:03 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-03-13 12:30:16 -0400 |
commit | 04166f48d9593af4513ae06c0f966c0cee300a20 (patch) | |
tree | 26d3c032b36bb9be5758cc9dd896288a78738d9e /net | |
parent | e920dde5160887d07b738f5a7f593b1fa9b1e32e (diff) |
Revert "netfilter: nf_tables: add flush field to struct nft_set_iter"
This reverts commit 1f48ff6c5393aa7fe290faf5d633164f105b0aa7.
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: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/netfilter/nf_tables_api.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 5e0ccfd5bb37..434c739dfeca 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c | |||
@@ -3145,7 +3145,6 @@ int nf_tables_bind_set(const struct nft_ctx *ctx, struct nft_set *set, | |||
3145 | iter.count = 0; | 3145 | iter.count = 0; |
3146 | iter.err = 0; | 3146 | iter.err = 0; |
3147 | iter.fn = nf_tables_bind_check_setelem; | 3147 | iter.fn = nf_tables_bind_check_setelem; |
3148 | iter.flush = false; | ||
3149 | 3148 | ||
3150 | set->ops->walk(ctx, set, &iter); | 3149 | set->ops->walk(ctx, set, &iter); |
3151 | if (iter.err < 0) | 3150 | if (iter.err < 0) |
@@ -3399,7 +3398,6 @@ static int nf_tables_dump_set(struct sk_buff *skb, struct netlink_callback *cb) | |||
3399 | args.iter.count = 0; | 3398 | args.iter.count = 0; |
3400 | args.iter.err = 0; | 3399 | args.iter.err = 0; |
3401 | args.iter.fn = nf_tables_dump_setelem; | 3400 | args.iter.fn = nf_tables_dump_setelem; |
3402 | args.iter.flush = false; | ||
3403 | set->ops->walk(&ctx, set, &args.iter); | 3401 | set->ops->walk(&ctx, set, &args.iter); |
3404 | 3402 | ||
3405 | nla_nest_end(skb, nest); | 3403 | nla_nest_end(skb, nest); |
@@ -3963,7 +3961,6 @@ static int nf_tables_delsetelem(struct net *net, struct sock *nlsk, | |||
3963 | struct nft_set_iter iter = { | 3961 | struct nft_set_iter iter = { |
3964 | .genmask = genmask, | 3962 | .genmask = genmask, |
3965 | .fn = nft_flush_set, | 3963 | .fn = nft_flush_set, |
3966 | .flush = true, | ||
3967 | }; | 3964 | }; |
3968 | set->ops->walk(&ctx, set, &iter); | 3965 | set->ops->walk(&ctx, set, &iter); |
3969 | 3966 | ||
@@ -5114,7 +5111,6 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx, | |||
5114 | iter.count = 0; | 5111 | iter.count = 0; |
5115 | iter.err = 0; | 5112 | iter.err = 0; |
5116 | iter.fn = nf_tables_loop_check_setelem; | 5113 | iter.fn = nf_tables_loop_check_setelem; |
5117 | iter.flush = false; | ||
5118 | 5114 | ||
5119 | set->ops->walk(ctx, set, &iter); | 5115 | set->ops->walk(ctx, set, &iter); |
5120 | if (iter.err < 0) | 5116 | if (iter.err < 0) |