diff options
| author |   Patrick McHardy <kaber@trash.net> | 2014-03-07 19:08:30 +0100 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2014-03-08 12:35:17 +0100 |
| commit | 62472bcefb56ae9c3a6be3284949ce758656cdec (patch) | |
| tree | 647c311d780fef18e125005b7eb833002ca599f9 /net/netfilter/nft_log.c | |
| parent | netfilter: nf_tables: clean up nf_tables_trans_add() argument order (diff) | |
| download | linux-dev-62472bcefb56ae9c3a6be3284949ce758656cdec.tar.xz linux-dev-62472bcefb56ae9c3a6be3284949ce758656cdec.zip | |
netfilter: nf_tables: restore context for expression destructors
In order to fix set destruction notifications and get rid of unnecessary
members in private data structures, pass the context to expressions'
destructor functions again.
In order to do so, replace various members in the nft_rule_trans structure
by the full context.
Signed-off-by: Patrick McHardy <kaber@trash.net>
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nft_log.c b/net/netfilter/nft_log.c index 26c5154e05f3..10cfb156cdf4 100644 --- a/net/netfilter/nft_log.c +++ b/net/netfilter/nft_log.c @@ -74,7 +74,8 @@ static int nft_log_init(const struct nft_ctx *ctx, return 0; } -static void nft_log_destroy(const struct nft_expr *expr) +static void nft_log_destroy(const struct nft_ctx *ctx, + const struct nft_expr *expr) { struct nft_log *priv = nft_expr_priv(expr); |