From d9c6a5d0977a6d8bbe772dbc31a2c4f58eec1708 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 19 Jul 2018 18:31:55 +0200 Subject: xtables: merge {ip,arp}tables_command_state structs Differences between both structs are marginal (apart from arptables_command_state being much smaller), so merge them into one. Struct iptables_command_state is already shared between iptables, ip6tables and ebtables. Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal --- iptables/nft-shared.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'iptables/nft-shared.h') diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h index d74eeb00..18927a29 100644 --- a/iptables/nft-shared.h +++ b/iptables/nft-shared.h @@ -49,7 +49,6 @@ enum { struct nft_xt_ctx { union { struct iptables_command_state *cs; - struct arptables_command_state *cs_arp; } state; struct nftnl_expr_iter *iter; int family; @@ -145,7 +144,7 @@ void nft_parse_meta(struct nft_xt_ctx *ctx, struct nftnl_expr *e); void nft_parse_payload(struct nft_xt_ctx *ctx, struct nftnl_expr *e); void nft_parse_counter(struct nftnl_expr *e, struct xt_counters *counters); void nft_parse_immediate(struct nft_xt_ctx *ctx, struct nftnl_expr *e); -void nft_rule_to_iptables_command_state(struct nftnl_rule *r, +void nft_rule_to_iptables_command_state(const struct nftnl_rule *r, struct iptables_command_state *cs); void print_header(unsigned int format, const char *chain, const char *pol, const struct xt_counters *counters, bool basechain, -- cgit v1.2.3