diff options
| author | Pablo Neira Ayuso | 2018-03-28 12:06:50 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2018-03-30 11:29:20 +0200 |
| commit | a3073c17dd8cd041d5cf68f28a80a54e310f2f45 (patch) | |
| tree | 1727848b826f1416378d1c907889b3c6ec26214f /net/netfilter/nf_tables_api.c | |
| parent | netfilter: nf_tables: rename to nft_set_lookup_global() (diff) | |
| download | kernel-qcow2-linux-a3073c17dd8cd041d5cf68f28a80a54e310f2f45.tar.gz kernel-qcow2-linux-a3073c17dd8cd041d5cf68f28a80a54e310f2f45.tar.xz kernel-qcow2-linux-a3073c17dd8cd041d5cf68f28a80a54e310f2f45.zip | |
netfilter: nf_tables: use nft_set_lookup_global from nf_tables_newsetelem()
Replace opencoded implementation of nft_set_lookup_global() by call to
this function.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_tables_api.c')
| -rw-r--r-- | net/netfilter/nf_tables_api.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 769d84015073..2bd80fa9b070 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -4032,17 +4032,10 @@ static int nf_tables_newsetelem(struct net *net, struct sock *nlsk, if (err < 0) return err; - set = nf_tables_set_lookup(ctx.table, nla[NFTA_SET_ELEM_LIST_SET], - genmask); - if (IS_ERR(set)) { - if (nla[NFTA_SET_ELEM_LIST_SET_ID]) { - set = nf_tables_set_lookup_byid(net, - nla[NFTA_SET_ELEM_LIST_SET_ID], - genmask); - } - if (IS_ERR(set)) - return PTR_ERR(set); - } + set = nft_set_lookup_global(net, ctx.table, nla[NFTA_SET_ELEM_LIST_SET], + nla[NFTA_SET_ELEM_LIST_SET_ID], genmask); + if (IS_ERR(set)) + return PTR_ERR(set); if (!list_empty(&set->bindings) && set->flags & NFT_SET_CONSTANT) return -EBUSY; |