summaryrefslogtreecommitdiff
path: root/net/netfilter/nft_immediate.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2014-03-07 18:08:30 (GMT)
committerPablo Neira Ayuso <pablo@netfilter.org>2014-03-08 11:35:17 (GMT)
commit62472bcefb56ae9c3a6be3284949ce758656cdec (patch)
tree647c311d780fef18e125005b7eb833002ca599f9 /net/netfilter/nft_immediate.c
parenta36e901cf60d4e9a1882d2a98b1a9c60e84aff2c (diff)
downloadlinux-62472bcefb56ae9c3a6be3284949ce758656cdec.tar.xz
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_immediate.c')
-rw-r--r--net/netfilter/nft_immediate.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nft_immediate.c b/net/netfilter/nft_immediate.c
index f169501..810385e 100644
--- a/net/netfilter/nft_immediate.c
+++ b/net/netfilter/nft_immediate.c
@@ -70,7 +70,8 @@ err1:
return err;
}
-static void nft_immediate_destroy(const struct nft_expr *expr)
+static void nft_immediate_destroy(const struct nft_ctx *ctx,
+ const struct nft_expr *expr)
{
const struct nft_immediate_expr *priv = nft_expr_priv(expr);
return nft_data_uninit(&priv->data, nft_dreg_to_type(priv->dreg));