From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org
Subject: [PATCH net-next 05/22] netfilter: x_tables: remove ipt_unregister_table
Date: Mon, 26 Apr 2021 19:10:39 +0200 [thread overview]
Message-ID: <20210426171056.345271-6-pablo@netfilter.org> (raw)
In-Reply-To: <20210426171056.345271-1-pablo@netfilter.org>
From: Florian Westphal <fw@strlen.de>
Its the same function as ipt_unregister_table_exit.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
include/linux/netfilter_ipv4/ip_tables.h | 3 ---
include/linux/netfilter_ipv6/ip6_tables.h | 2 --
net/ipv4/netfilter/ip_tables.c | 9 ---------
net/ipv4/netfilter/iptable_nat.c | 2 +-
net/ipv6/netfilter/ip6_tables.c | 9 ---------
net/ipv6/netfilter/ip6table_nat.c | 2 +-
6 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index c4676d6feeff..9f440eb6cf6c 100644
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -31,9 +31,6 @@ void ipt_unregister_table_pre_exit(struct net *net, struct xt_table *table,
void ipt_unregister_table_exit(struct net *net, struct xt_table *table);
-void ipt_unregister_table(struct net *net, struct xt_table *table,
- const struct nf_hook_ops *ops);
-
/* Standard entry. */
struct ipt_standard {
struct ipt_entry entry;
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index 1547d5f9ae06..b88a27ce61b0 100644
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -27,8 +27,6 @@ extern void *ip6t_alloc_initial_table(const struct xt_table *);
int ip6t_register_table(struct net *net, const struct xt_table *table,
const struct ip6t_replace *repl,
const struct nf_hook_ops *ops, struct xt_table **res);
-void ip6t_unregister_table(struct net *net, struct xt_table *table,
- const struct nf_hook_ops *ops);
void ip6t_unregister_table_pre_exit(struct net *net, struct xt_table *table,
const struct nf_hook_ops *ops);
void ip6t_unregister_table_exit(struct net *net, struct xt_table *table);
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index f77ea0dbe656..2fa7f28b88e3 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -1770,14 +1770,6 @@ void ipt_unregister_table_exit(struct net *net, struct xt_table *table)
__ipt_unregister_table(net, table);
}
-void ipt_unregister_table(struct net *net, struct xt_table *table,
- const struct nf_hook_ops *ops)
-{
- if (ops)
- ipt_unregister_table_pre_exit(net, table, ops);
- __ipt_unregister_table(net, table);
-}
-
/* Returns 1 if the type and code is matched by the range, 0 otherwise */
static inline bool
icmp_type_code_match(u_int8_t test_type, u_int8_t min_code, u_int8_t max_code,
@@ -1924,7 +1916,6 @@ static void __exit ip_tables_fini(void)
}
EXPORT_SYMBOL(ipt_register_table);
-EXPORT_SYMBOL(ipt_unregister_table);
EXPORT_SYMBOL(ipt_unregister_table_pre_exit);
EXPORT_SYMBOL(ipt_unregister_table_exit);
EXPORT_SYMBOL(ipt_do_table);
diff --git a/net/ipv4/netfilter/iptable_nat.c b/net/ipv4/netfilter/iptable_nat.c
index b0143b109f25..a89c1b9f94c2 100644
--- a/net/ipv4/netfilter/iptable_nat.c
+++ b/net/ipv4/netfilter/iptable_nat.c
@@ -105,7 +105,7 @@ static int __net_init iptable_nat_table_init(struct net *net)
ret = ipt_nat_register_lookups(net);
if (ret < 0) {
- ipt_unregister_table(net, net->ipv4.nat_table, NULL);
+ ipt_unregister_table_exit(net, net->ipv4.nat_table);
net->ipv4.nat_table = NULL;
}
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index eb2b5404806c..e605c28cfed5 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -1780,14 +1780,6 @@ void ip6t_unregister_table_exit(struct net *net, struct xt_table *table)
__ip6t_unregister_table(net, table);
}
-void ip6t_unregister_table(struct net *net, struct xt_table *table,
- const struct nf_hook_ops *ops)
-{
- if (ops)
- ip6t_unregister_table_pre_exit(net, table, ops);
- __ip6t_unregister_table(net, table);
-}
-
/* Returns 1 if the type and code is matched by the range, 0 otherwise */
static inline bool
icmp6_type_code_match(u_int8_t test_type, u_int8_t min_code, u_int8_t max_code,
@@ -1935,7 +1927,6 @@ static void __exit ip6_tables_fini(void)
}
EXPORT_SYMBOL(ip6t_register_table);
-EXPORT_SYMBOL(ip6t_unregister_table);
EXPORT_SYMBOL(ip6t_unregister_table_pre_exit);
EXPORT_SYMBOL(ip6t_unregister_table_exit);
EXPORT_SYMBOL(ip6t_do_table);
diff --git a/net/ipv6/netfilter/ip6table_nat.c b/net/ipv6/netfilter/ip6table_nat.c
index 0a23265e3caa..4cef1b405074 100644
--- a/net/ipv6/netfilter/ip6table_nat.c
+++ b/net/ipv6/netfilter/ip6table_nat.c
@@ -107,7 +107,7 @@ static int __net_init ip6table_nat_table_init(struct net *net)
ret = ip6t_nat_register_lookups(net);
if (ret < 0) {
- ip6t_unregister_table(net, net->ipv6.ip6table_nat, NULL);
+ ip6t_unregister_table_exit(net, net->ipv6.ip6table_nat);
net->ipv6.ip6table_nat = NULL;
}
kfree(repl);
--
2.30.2
next prev parent reply other threads:[~2021-04-26 17:11 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-26 17:10 [PATCH net-next 00/22] Netfilter updates for net-next Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 01/22] netfilter: nat: move nf_xfrm_me_harder to where it is used Pablo Neira Ayuso
2021-04-26 19:53 ` patchwork-bot+netdevbpf
2021-04-26 17:10 ` [PATCH net-next 02/22] netfilter: nft_socket: add support for cgroupsv2 Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 03/22] netfilter: disable defrag once its no longer needed Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 04/22] netfilter: ebtables: remove the 3 ebtables pointers from struct net Pablo Neira Ayuso
2021-04-26 17:10 ` Pablo Neira Ayuso [this message]
2021-04-26 17:10 ` [PATCH net-next 06/22] netfilter: x_tables: add xt_find_table Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 07/22] netfilter: iptables: unregister the tables by name Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 08/22] netfilter: ip6tables: " Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 09/22] netfilter: arptables: " Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 10/22] netfilter: x_tables: remove paranoia tests Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 11/22] netfilter: xt_nat: pass table to hookfn Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 12/22] netfilter: ip_tables: pass table pointer via nf_hook_ops Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 13/22] netfilter: arp_tables: " Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 14/22] netfilter: ip6_tables: " Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 15/22] netfilter: remove all xt_table anchors from struct net Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 16/22] netfilter: nf_log_syslog: Unset bridge logger in pernet exit Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 17/22] netfilter: nftables: add nft_pernet() helper function Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 18/22] netfilter: nfnetlink: add struct nfnl_info and pass it to callbacks Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 19/22] netfilter: nfnetlink: pass struct nfnl_info to rcu callbacks Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 20/22] netfilter: nfnetlink: pass struct nfnl_info to batch callbacks Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 21/22] netfilter: nfnetlink: consolidate callback types Pablo Neira Ayuso
2021-04-26 17:10 ` [PATCH net-next 22/22] netfilter: allow to turn off xtables compat layer Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210426171056.345271-6-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).