net/ipv6/netfilter: solve section mismatch in nf_conntrack_reasm

PATCH Applied Hein Tibosch 3 participants 3 messages Oct 27, 2012 – Oct 28, 2012

Subsystems (2)

Networking netfilter

lore

Share & tools

lore

Hein Tibosch

author

2012-10-27 10:32 UTC #0 lore raw

PATCH 1/1 net/ipv6/netfilter: solve section mismatch in nf_conntrack_reasm

From: Hein Tibosch <[email protected]>
Subject: net/ipv6/netfilter: solve section mismatch in nf_conntrack_reasm

WARNING: net/ipv6/netfilter/nf_defrag_ipv6.o(.text+0xe0): Section mismatch in reference from the function nf_ct_net_init() to the function .init.text:nf_ct_frag6_sysctl_register()
The function nf_ct_net_init() references
the function __init nf_ct_frag6_sysctl_register().
etc

In case nf_conntrack_ipv6 is compiled as a module, nf_ct_net_init could be called after the init code and data are unloaded.
Therefore remove the "__net_init" annotation from nf_ct_frag6_sysctl_register()

Signed-off-by Hein Tibosch <[email protected]>

---
 net/ipv6/netfilter/nf_conntrack_reasm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

net/ipv6/netfilter/nf_conntrack_reasm.c +2 -2

index 18bd9bb..22c8ea9 100644
@@ -85,7 +85,7 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
 	{ }
 };
 
-static int __net_init nf_ct_frag6_sysctl_register(struct net *net)
+static int nf_ct_frag6_sysctl_register(struct net *net)
 {
 	struct ctl_table *table;
 	struct ctl_table_header *hdr;

@@ -127,7 +127,7 @@ static void __net_exit nf_ct_frags6_sysctl_unregister(struct net *net)
 }
 
 #else
-static int __net_init nf_ct_frag6_sysctl_register(struct net *net)
+static int nf_ct_frag6_sysctl_register(struct net *net)
 {
 	return 0;
 }

Signature · 1 line

1.7.8.0

Cong Wang

Acked-by on v1 1/1

2012-10-28 12:50 UTC #1 lore raw

Quoted 10 lines · Hein Tibosch

From: Hein Tibosch <[email protected]>
Subject: net/ipv6/netfilter: solve section mismatch in nf_conntrack_reasm
WARNING: net/ipv6/netfilter/nf_defrag_ipv6.o(.text+0xe0): Section mismatch in reference from the function nf_ct_net_init() to the function .init.text:nf_ct_frag6_sysctl_register()
The function nf_ct_net_init() references
the function __init nf_ct_frag6_sysctl_register().
etc

Quoted 5 lines

In case nf_conntrack_ipv6 is compiled as a module, nf_ct_net_init could be called after the init code and data are unloaded.
Therefore remove the "__net_init" annotation from nf_ct_frag6_sysctl_register()
Signed-off-by Hein Tibosch <[email protected]>

Acked-by Cong Wang <[email protected]>

Thanks!

Pablo Neira Ayuso

maintainer Applied

2012-10-28 22:50 UTC #2 lore raw

Quoted 11 lines · Cong Wang

Quoted 10 lines · Hein Tibosch
From: Hein Tibosch <[email protected]>
Subject: net/ipv6/netfilter: solve section mismatch in nf_conntrack_reasm
WARNING: net/ipv6/netfilter/nf_defrag_ipv6.o(.text+0xe0): Section mismatch in reference from the function nf_ct_net_init() to the function .init.text:nf_ct_frag6_sysctl_register()
The function nf_ct_net_init() references
the function __init nf_ct_frag6_sysctl_register().
etc

Quoted 7 lines

Quoted 5 lines
In case nf_conntrack_ipv6 is compiled as a module, nf_ct_net_init could be called after the init code and data are unloaded.
Therefore remove the "__net_init" annotation from nf_ct_frag6_sysctl_register()
Signed-off-by Hein Tibosch <[email protected]>
Acked-by Cong Wang <[email protected]>

Applied, thanks.