diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2017-03-06 17:46:20 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-03-06 18:23:23 +0100 |
| commit | c7a72e3fdb5d77486ca3a0ac942c0a2e0d80d5bb (patch) | |
| tree | 6ed84607ebb0bb3cf04047d7be9312408ea48879 /net/netfilter/nft_lookup.c | |
| parent | netfilter: nf_tables: validate the expr explicitly after init successfully (diff) | |
| download | linux-dev-c7a72e3fdb5d77486ca3a0ac942c0a2e0d80d5bb.tar.xz linux-dev-c7a72e3fdb5d77486ca3a0ac942c0a2e0d80d5bb.zip | |
netfilter: nf_tables: add nft_set_lookup()
This new function consolidates set lookup via either name or ID by
introducing a new nft_set_lookup() function. Replace existing spots
where we can use this too.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nft_lookup.c')
| -rw-r--r-- | net/netfilter/nft_lookup.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c index e21aea7e5ec8..475570e89ede 100644 --- a/net/netfilter/nft_lookup.c +++ b/net/netfilter/nft_lookup.c @@ -71,16 +71,10 @@ static int nft_lookup_init(const struct nft_ctx *ctx, tb[NFTA_LOOKUP_SREG] == NULL) return -EINVAL; - set = nf_tables_set_lookup(ctx->table, tb[NFTA_LOOKUP_SET], genmask); - if (IS_ERR(set)) { - if (tb[NFTA_LOOKUP_SET_ID]) { - set = nf_tables_set_lookup_byid(ctx->net, - tb[NFTA_LOOKUP_SET_ID], - genmask); - } - if (IS_ERR(set)) - return PTR_ERR(set); - } + set = nft_set_lookup(ctx->net, ctx->table, tb[NFTA_LOOKUP_SET], + tb[NFTA_LOOKUP_SET_ID], genmask); + if (IS_ERR(set)) + return PTR_ERR(set); if (set->flags & NFT_SET_EVAL) return -EOPNOTSUPP; |