diff options
-rw-r--r-- | include/net/netfilter/nf_nat.h | 2 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 3 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_nat_standalone.c | 2 |
3 files changed, 0 insertions, 7 deletions
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h index 0425e28c6a78..0541eed5008f 100644 --- a/include/net/netfilter/nf_nat.h +++ b/include/net/netfilter/nf_nat.h | |||
@@ -95,8 +95,6 @@ static inline struct nf_conn_nat *nfct_nat(const struct nf_conn *ct) | |||
95 | return nf_ct_ext_find(ct, NF_CT_EXT_NAT); | 95 | return nf_ct_ext_find(ct, NF_CT_EXT_NAT); |
96 | } | 96 | } |
97 | 97 | ||
98 | extern int nf_nat_module_is_loaded; | ||
99 | |||
100 | #else /* !__KERNEL__: iptables wants this to compile. */ | 98 | #else /* !__KERNEL__: iptables wants this to compile. */ |
101 | #define nf_nat_multi_range nf_nat_multi_range_compat | 99 | #define nf_nat_multi_range nf_nat_multi_range_compat |
102 | #endif /*__KERNEL__*/ | 100 | #endif /*__KERNEL__*/ |
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(); |