* [PATCH] net/ipv6/netfilter: solve section mismatch in nf_conntrack_reasm
@ 2012-10-27 9:49 Hein Tibosch
2012-10-28 12:49 ` Cong Wang
0 siblings, 1 reply; 3+ messages in thread
From: Hein Tibosch @ 2012-10-27 9:49 UTC (permalink / raw)
To: David Miller
Cc: Andrew Morton, netfilter-devel, Cong Wang, Michal Kubeček,
Herbert Xu, Yasuyuki Kozakai
From: Hein Tibosch <hein_tibosch@yahoo.es>
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 <hein_tibosch@yahoo.es>
---
net/ipv6/netfilter/nf_conntrack_reasm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 18bd9bb..22c8ea9 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -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;
}
--
1.7.8.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net/ipv6/netfilter: solve section mismatch in nf_conntrack_reasm
2012-10-27 9:49 [PATCH] net/ipv6/netfilter: solve section mismatch in nf_conntrack_reasm Hein Tibosch
@ 2012-10-28 12:49 ` Cong Wang
2012-10-28 22:50 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Cong Wang @ 2012-10-28 12:49 UTC (permalink / raw)
To: Hein Tibosch
Cc: David Miller, Andrew Morton, netfilter-devel, Michal Kubeček,
Herbert Xu, Yasuyuki Kozakai
On Sat, 2012-10-27 at 17:49 +0800, Hein Tibosch wrote:
> From: Hein Tibosch <hein_tibosch@yahoo.es>
> 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 <hein_tibosch@yahoo.es>
Acked-by: Cong Wang <amwang@redhat.com>
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net/ipv6/netfilter: solve section mismatch in nf_conntrack_reasm
2012-10-28 12:49 ` Cong Wang
@ 2012-10-28 22:50 ` Pablo Neira Ayuso
0 siblings, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2012-10-28 22:50 UTC (permalink / raw)
To: Cong Wang
Cc: Hein Tibosch, David Miller, Andrew Morton, netfilter-devel,
Michal Kubeček, Herbert Xu, Yasuyuki Kozakai
On Sun, Oct 28, 2012 at 08:49:45PM +0800, Cong Wang wrote:
> On Sat, 2012-10-27 at 17:49 +0800, Hein Tibosch wrote:
> > From: Hein Tibosch <hein_tibosch@yahoo.es>
> > 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 <hein_tibosch@yahoo.es>
>
> Acked-by: Cong Wang <amwang@redhat.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-28 22:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-27 9:49 [PATCH] net/ipv6/netfilter: solve section mismatch in nf_conntrack_reasm Hein Tibosch
2012-10-28 12:49 ` Cong Wang
2012-10-28 22:50 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).