lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: nf_nat: remove unused nf_nat_module_is_loaded

Browse Source 
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yasuyuki Kozakai
2007-07-07 22:25:28 -07:00
committed by David S. Miller
parent 2d59e5ca8c
commit ff09b7493c
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/netfilter/nf_nat.h
View File

@@ -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); return nf_ct_ext_find(ct, NF_CT_EXT_NAT);
} }
extern int nf_nat_module_is_loaded;
#else /* !__KERNEL__: iptables wants this to compile. */ #else /* !__KERNEL__: iptables wants this to compile. */
#define nf_nat_multi_range nf_nat_multi_range_compat #define nf_nat_multi_range nf_nat_multi_range_compat
#endif /*__KERNEL__*/ #endif /*__KERNEL__*/

3
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
View File

@@ -103,9 +103,6 @@ ipv4_prepare(struct sk_buff **pskb, unsigned int hooknum, unsigned int *dataoff,
return NF_ACCEPT; 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) static u_int32_t ipv4_get_features(const struct nf_conntrack_tuple *tuple)
{ {
return NF_CT_F_BASIC; return NF_CT_F_BASIC;

2
net/ipv4/netfilter/nf_nat_standalone.c
View File

@@ -350,7 +350,6 @@ static int __init nf_nat_standalone_init(void)
printk("nf_nat_init: can't register hooks.\n"); printk("nf_nat_init: can't register hooks.\n");
goto cleanup_rule_init; goto cleanup_rule_init;
} }
nf_nat_module_is_loaded = 1;
return ret; return ret;
cleanup_rule_init: 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_unregister_hooks(nf_nat_ops, ARRAY_SIZE(nf_nat_ops));
nf_nat_rule_cleanup(); nf_nat_rule_cleanup();
nf_nat_module_is_loaded = 0;
#ifdef CONFIG_XFRM #ifdef CONFIG_XFRM
ip_nat_decode_session = NULL; ip_nat_decode_session = NULL;
synchronize_net(); synchronize_net();