diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-01-09 02:38:03 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-01-10 15:32:08 +0100 |
| commit | 36596dadf54a920d26286cf9f421fb4ef648b51f (patch) | |
| tree | e9e5cdd54acb21f0ccfa88c851bb7f6418bc4609 /net/netfilter/nft_log.c | |
| parent | 1ea26cca52e46c0f29ee9fdd567312ba93a7d651 (diff) | |
| download | linux-36596dadf54a920d26286cf9f421fb4ef648b51f.tar.gz linux-36596dadf54a920d26286cf9f421fb4ef648b51f.tar.bz2 linux-36596dadf54a920d26286cf9f421fb4ef648b51f.zip | |
netfilter: nf_tables: add single table list for all families
Place all existing user defined tables in struct net *, instead of
having one list per family. This saves us from one level of indentation
in netlink dump functions.
Place pointer to struct nft_af_info in struct nft_table temporarily, as
we still need this to put back reference module reference counter on
table removal.
This patch comes in preparation for the removal of struct nft_af_info.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nft_log.c')
| -rw-r--r-- | net/netfilter/nft_log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nft_log.c b/net/netfilter/nft_log.c index 6f6e64423643..a27be36dc0af 100644 --- a/net/netfilter/nft_log.c +++ b/net/netfilter/nft_log.c @@ -112,7 +112,7 @@ static int nft_log_init(const struct nft_ctx *ctx, break; } - err = nf_logger_find_get(ctx->afi->family, li->type); + err = nf_logger_find_get(ctx->family, li->type); if (err < 0) goto err1; @@ -133,7 +133,7 @@ static void nft_log_destroy(const struct nft_ctx *ctx, if (priv->prefix != nft_log_null_prefix) kfree(priv->prefix); - nf_logger_put(ctx->afi->family, li->type); + nf_logger_put(ctx->family, li->type); } static int nft_log_dump(struct sk_buff *skb, const struct nft_expr *expr) |