diff options
author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2007-07-08 01:25:28 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-11 01:17:34 -0400 |
commit | ff09b7493c8f433d3ffd6a31ad58d190f82ef0c5 (patch) | |
tree | 8c9f1b55f9f0d97543c3751220dc91ab75895072 /net/ipv4 | |
parent | 2d59e5ca8c7113ad91452f0f9259a4b55ee90323 (diff) |
[NETFILTER]: nf_nat: remove unused nf_nat_module_is_loaded
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>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 3 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_nat_standalone.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c index 96f641d07a40..7411dd16d779 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | |||
@@ -103,9 +103,6 @@ ipv4_prepare(struct sk_buff **pskb, unsigned int hooknum, unsigned int *dataoff, | |||
103 | return NF_ACCEPT; | 103 | return NF_ACCEPT; |
104 | } | 104 | } |
105 | 105 | ||
106 | int nf_nat_module_is_loaded = 0; | ||
107 | EXPORT_SYMBOL_GPL(nf_nat_module_is_loaded); | ||
108 | |||
109 | static u_int32_t ipv4_get_features(const struct nf_conntrack_tuple *tuple) | 106 | static u_int32_t ipv4_get_features(const struct nf_conntrack_tuple *tuple) |
110 | { | 107 | { |
111 | return NF_CT_F_BASIC; | 108 | return NF_CT_F_BASIC; |
diff --git a/net/ipv4/netfilter/nf_nat_standalone.c b/net/ipv4/netfilter/nf_nat_standalone.c index 51a2708f7bf0..30eeaa4c645c 100644 --- a/net/ipv4/netfilter/nf_nat_standalone.c +++ b/net/ipv4/netfilter/nf_nat_standalone.c | |||
@@ -350,7 +350,6 @@ static int __init nf_nat_standalone_init(void) | |||
350 | printk("nf_nat_init: can't register hooks.\n"); | 350 | printk("nf_nat_init: can't register hooks.\n"); |
351 | goto cleanup_rule_init; | 351 | goto cleanup_rule_init; |
352 | } | 352 | } |
353 | nf_nat_module_is_loaded = 1; | ||
354 | return ret; | 353 | return ret; |
355 | 354 | ||
356 | cleanup_rule_init: | 355 | cleanup_rule_init: |
@@ -367,7 +366,6 @@ static void __exit nf_nat_standalone_fini(void) | |||
367 | { | 366 | { |
368 | nf_unregister_hooks(nf_nat_ops, ARRAY_SIZE(nf_nat_ops)); | 367 | nf_unregister_hooks(nf_nat_ops, ARRAY_SIZE(nf_nat_ops)); |
369 | nf_nat_rule_cleanup(); | 368 | nf_nat_rule_cleanup(); |
370 | nf_nat_module_is_loaded = 0; | ||
371 | #ifdef CONFIG_XFRM | 369 | #ifdef CONFIG_XFRM |
372 | ip_nat_decode_session = NULL; | 370 | ip_nat_decode_session = NULL; |
373 | synchronize_net(); | 371 | synchronize_net(); |