diff options
| author | Patrick McHardy | 2014-03-07 19:08:30 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2014-03-08 12:35:17 +0100 |
| commit | 62472bcefb56ae9c3a6be3284949ce758656cdec (patch) | |
| tree | 647c311d780fef18e125005b7eb833002ca599f9 /include/net | |
| parent | netfilter: nf_tables: clean up nf_tables_trans_add() argument order (diff) | |
| download | kernel-qcow2-linux-62472bcefb56ae9c3a6be3284949ce758656cdec.tar.gz kernel-qcow2-linux-62472bcefb56ae9c3a6be3284949ce758656cdec.tar.xz kernel-qcow2-linux-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 'include/net')
| -rw-r--r-- | include/net/netfilter/nf_tables.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h index 5af56da6d6c6..e6bc14d8fa9a 100644 --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h @@ -289,7 +289,8 @@ struct nft_expr_ops { int (*init)(const struct nft_ctx *ctx, const struct nft_expr *expr, const struct nlattr * const tb[]); - void (*destroy)(const struct nft_expr *expr); + void (*destroy)(const struct nft_ctx *ctx, + const struct nft_expr *expr); int (*dump)(struct sk_buff *skb, const struct nft_expr *expr); int (*validate)(const struct nft_ctx *ctx, @@ -343,19 +344,13 @@ struct nft_rule { * struct nft_rule_trans - nf_tables rule update in transaction * * @list: used internally + * @ctx: rule context * @rule: rule that needs to be updated - * @chain: chain that this rule belongs to - * @table: table for which this chain applies - * @nlh: netlink header of the message that contain this update - * @family: family expressesed as AF_* */ struct nft_rule_trans { struct list_head list; + struct nft_ctx ctx; struct nft_rule *rule; - const struct nft_chain *chain; - const struct nft_table *table; - const struct nlmsghdr *nlh; - u8 family; }; static inline struct nft_expr *nft_expr_first(const struct nft_rule *rule) |