summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Lezcano <dlezcano@fr.ibm.com>2007-12-13 14:34:58 +0100
committerDavid S. Miller <davem@davemloft.net>2008-01-28 23:57:46 +0100
commit09f7709f4929666006931f1d4efc498a6d419bbc (patch)
tree344e5b2909567eea3a2275d3b22fb8c4413157fb
parent[DCCP]: Perform SHUT_RD and SHUT_WR on receiving close (diff)
downloadlinux-09f7709f4929666006931f1d4efc498a6d419bbc.tar.xz
linux-09f7709f4929666006931f1d4efc498a6d419bbc.zip
[IPV6]: fix section mismatch warnings
Removed useless and buggy __exit section in the different ipv6 subsystems. Otherwise they will be called inside an init section during rollbacking in case of an error in the protocol initialization. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/addrconf.c2
-rw-r--r--net/ipv6/raw.c2
-rw-r--r--net/ipv6/tcp_ipv6.c2
-rw-r--r--net/ipv6/udp.c2
-rw-r--r--net/ipv6/udplite.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index ba6f7925c178..6a48bb88f46d 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -4223,7 +4223,7 @@ errout:
return err;
}
-void __exit addrconf_cleanup(void)
+void addrconf_cleanup(void)
{
struct net_device *dev;
struct inet6_ifaddr *ifa;
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 2663fd1323e4..45a580e843dc 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -1321,7 +1321,7 @@ out:
return ret;
}
-void __exit rawv6_exit(void)
+void rawv6_exit(void)
{
inet6_unregister_protosw(&rawv6_protosw);
}
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 0ef99864ef8a..0268e118f0b4 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -2193,7 +2193,7 @@ out_tcpv6_protosw:
goto out;
}
-void __exit tcpv6_exit(void)
+void tcpv6_exit(void)
{
sock_release(tcp6_socket);
inet6_unregister_protosw(&tcpv6_protosw);
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 8cbdcc9602df..8b3e6d61bf55 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1035,7 +1035,7 @@ out_udpv6_protocol:
goto out;
}
-void __exit udpv6_exit(void)
+void udpv6_exit(void)
{
inet6_unregister_protosw(&udpv6_protosw);
inet6_del_protocol(&udpv6_protocol, IPPROTO_UDP);
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index f20b376689fb..39f070518e68 100644
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -96,7 +96,7 @@ out_udplitev6_protocol:
goto out;
}
-void __exit udplitev6_exit(void)
+void udplitev6_exit(void)
{
inet6_unregister_protosw(&udplite6_protosw);
inet6_del_protocol(&udplitev6_protocol, IPPROTO_UDPLITE);