diff options
| author | Pablo Neira Ayuso | 2017-12-09 15:43:17 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2018-01-08 18:01:22 +0100 |
| commit | c2f9eafee9aaeedaad9eadbf47913f4681d723df (patch) | |
| tree | ae05f60c0f5df4d1459ec7d301f8c8c1e1af174e /net/netfilter/nf_tables_api.c | |
| parent | netfilter: nf_tables: remove multihook chains and families (diff) | |
| download | kernel-qcow2-linux-c2f9eafee9aaeedaad9eadbf47913f4681d723df.tar.gz kernel-qcow2-linux-c2f9eafee9aaeedaad9eadbf47913f4681d723df.tar.xz kernel-qcow2-linux-c2f9eafee9aaeedaad9eadbf47913f4681d723df.zip | |
netfilter: nf_tables: remove hooks from family definition
They don't belong to the family definition, move them to the filter
chain type definition instead.
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 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 06fae437c9cb..15773a3189ce 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1357,7 +1357,6 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask, if (nla[NFTA_CHAIN_HOOK]) { struct nft_chain_hook hook; struct nf_hook_ops *ops; - nf_hookfn *hookfn; err = nft_chain_parse_hook(net, nla, afi, &hook, create); if (err < 0) @@ -1383,7 +1382,6 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask, static_branch_inc(&nft_counters_enabled); } - hookfn = hook.type->hooks[hook.num]; basechain->type = hook.type; chain = &basechain->chain; @@ -1392,10 +1390,8 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask, ops->hooknum = hook.num; ops->priority = hook.priority; ops->priv = chain; - ops->hook = afi->hooks[ops->hooknum]; + ops->hook = hook.type->hooks[ops->hooknum]; ops->dev = hook.dev; - if (hookfn) - ops->hook = hookfn; if (basechain->type->type == NFT_CHAIN_T_NAT) ops->nat_hook = true; |