Commit 7716bf09 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: x_tables: remove ipt_unregister_table 



Its the same function as ipt_unregister_table_exit.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 4c95e072

include/linux/netfilter_ipv4/ip_tables.h

+0 −3
Original line number Diff line number Diff line
@@ -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;

include/linux/netfilter_ipv6/ip6_tables.h

+0 −2
Original line number Diff line number Diff line
@@ -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);

net/ipv4/netfilter/ip_tables.c

+0 −9
Original line number Diff line number Diff line
@@ -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);

net/ipv4/netfilter/iptable_nat.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

net/ipv6/netfilter/ip6_tables.c

+0 −9
Original line number Diff line number Diff line
@@ -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);