* [PATCH 06/10] nf_nat: Removes unused nf_nat_module_is_loaded
@ 2007-06-25 3:15 Yasuyuki KOZAKAI
0 siblings, 0 replies; 3+ messages in thread
From: Yasuyuki KOZAKAI @ 2007-06-25 3:15 UTC (permalink / raw)
To: netfilter-devel; +Cc: rusty, kaber, pablo, kadlec
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
---
include/net/netfilter/nf_nat.h | 2 --
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 3 ---
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 712edec..b642dae 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -93,8 +93,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__*/
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 96f641d..7411dd1 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,
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;
diff --git a/net/ipv4/netfilter/nf_nat_standalone.c b/net/ipv4/netfilter/nf_nat_standalone.c
index 2dfa931..16dfa5a 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)
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();
--
1.5.2.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 06/10] nf_nat: Removes unused nf_nat_module_is_loaded
@ 2007-06-25 17:22 Yasuyuki KOZAKAI
0 siblings, 0 replies; 3+ messages in thread
From: Yasuyuki KOZAKAI @ 2007-06-25 17:22 UTC (permalink / raw)
To: kaber; +Cc: netfilter-devel
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
---
include/net/netfilter/nf_nat.h | 2 --
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 3 ---
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 712edec..b642dae 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -93,8 +93,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__*/
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 96f641d..7411dd1 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,
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;
diff --git a/net/ipv4/netfilter/nf_nat_standalone.c b/net/ipv4/netfilter/nf_nat_standalone.c
index 2dfa931..16dfa5a 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)
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();
--
1.5.2.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 06/10] nf_nat: Removes unused nf_nat_module_is_loaded
[not found] <200706251722.l5PHM8J1023549@toshiba.co.jp>
@ 2007-06-25 18:21 ` Patrick McHardy
0 siblings, 0 replies; 3+ messages in thread
From: Patrick McHardy @ 2007-06-25 18:21 UTC (permalink / raw)
To: Yasuyuki KOZAKAI; +Cc: netfilter-devel
Yasuyuki KOZAKAI wrote:
> Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
> ---
> include/net/netfilter/nf_nat.h | 2 --
> net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 3 ---
> net/ipv4/netfilter/nf_nat_standalone.c | 2 --
> 3 files changed, 0 insertions(+), 7 deletions(-)
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-06-25 18:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <200706251722.l5PHM8J1023549@toshiba.co.jp>
2007-06-25 18:21 ` [PATCH 06/10] nf_nat: Removes unused nf_nat_module_is_loaded Patrick McHardy
2007-06-25 17:22 Yasuyuki KOZAKAI
-- strict thread matches above, loose matches on Subject: below --
2007-06-25 3:15 Yasuyuki KOZAKAI
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.