From 34e1e234a937242ebebbe225438b4567ca0c5bd2 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 19 Jul 2018 18:32:02 +0200 Subject: xtables: eliminate nft_ipv{4,6}_rule_find() Both functions just pass their parameters 1:1 to nft_ipv46_rule_find, so replace them by the latter after minor adjustment to match expected callback signature. Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal --- iptables/nft-ipv4.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'iptables/nft-ipv4.c') diff --git a/iptables/nft-ipv4.c b/iptables/nft-ipv4.c index 2afb1453..2ca3155e 100644 --- a/iptables/nft-ipv4.c +++ b/iptables/nft-ipv4.c @@ -414,14 +414,6 @@ static void nft_ipv4_post_parse(int command, " source or destination IP addresses"); } -static bool nft_ipv4_rule_find(struct nft_family_ops *ops, - struct nftnl_rule *r, void *data) -{ - struct iptables_command_state *cs = data; - - return nft_ipv46_rule_find(ops, r, cs); -} - static void nft_ipv4_save_counters(const void *data) { const struct iptables_command_state *cs = data; @@ -506,6 +498,6 @@ struct nft_family_ops nft_family_ops_ipv4 = { .parse_target = nft_ipv46_parse_target, .rule_to_cs = nft_rule_to_iptables_command_state, .clear_cs = nft_clear_iptables_command_state, - .rule_find = nft_ipv4_rule_find, + .rule_find = nft_ipv46_rule_find, .xlate = nft_ipv4_xlate, }; -- cgit v1.2.3