Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff09b749 authored by Yasuyuki Kozakai's avatar Yasuyuki Kozakai Committed by David S. Miller
Browse files

[NETFILTER]: nf_nat: remove unused nf_nat_module_is_loaded 



Signed-off-by: default avatarYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d59e5ca

include/net/netfilter/nf_nat.h

+0 −2
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ static inline struct nf_conn_nat *nfct_nat(const struct nf_conn *ct) 
	return nf_ct_ext_find(ct, NF_CT_EXT_NAT);

}



extern int nf_nat_module_is_loaded;



#else  /* !__KERNEL__: iptables wants this to compile. */

#define nf_nat_multi_range nf_nat_multi_range_compat

#endif /*__KERNEL__*/

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+0 −3
Original line number Diff line number Diff line
@@ -103,9 +103,6 @@ ipv4_prepare(struct sk_buff **pskb, unsigned int hooknum, unsigned int *dataoff, 
	return NF_ACCEPT;

}



int nf_nat_module_is_loaded = 0;

EXPORT_SYMBOL_GPL(nf_nat_module_is_loaded);



static u_int32_t ipv4_get_features(const struct nf_conntrack_tuple *tuple)

{

	return NF_CT_F_BASIC;

net/ipv4/netfilter/nf_nat_standalone.c

+0 −2
Original line number Diff line number Diff line
@@ -350,7 +350,6 @@ static int __init nf_nat_standalone_init(void) 
		printk("nf_nat_init: can't register hooks.\n");

		goto cleanup_rule_init;

	}

	nf_nat_module_is_loaded = 1;

	return ret;



 cleanup_rule_init:
@@ -367,7 +366,6 @@ static void __exit nf_nat_standalone_fini(void) 
{

	nf_unregister_hooks(nf_nat_ops, ARRAY_SIZE(nf_nat_ops));

	nf_nat_rule_cleanup();

	nf_nat_module_is_loaded = 0;

#ifdef CONFIG_XFRM

	ip_nat_decode_session = NULL;

	synchronize_net();