Explorar o código

netfilter: nf_defrag_ipv6: 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().

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>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Hein Tibosch %!s(int64=13) %!d(string=hai) anos
pai
achega
f1df1374dc
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      net/ipv6/netfilter/nf_conntrack_reasm.c

+ 2 - 2
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 *table;
 	struct ctl_table_header *hdr;
 	struct ctl_table_header *hdr;
@@ -127,7 +127,7 @@ static void __net_exit nf_ct_frags6_sysctl_unregister(struct net *net)
 }
 }
 
 
 #else
 #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;
 	return 0;
 }
 }