[IPV6]: make the protocol initialization to return an error code

This patchset makes the different protocols to return an error code, so
the af_inet6 module can check the initialization was correct or not.

The raw6 was taken into account to be consistent with the rest of the
protocols, but the registration is at the same place.
Because the raw6 has its own init function, the proto and the ops structure
can be moved inside the raw6.c file.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 29 insertions, 7 deletions

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 93980c3b83e6..9544beb6d1ca 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -2166,14 +2166,36 @@ static struct inet_protosw tcpv6_protosw = {
                                 INET_PROTOSW_ICSK,
 };
 
-void __init tcpv6_init(void)
+int __init tcpv6_init(void)
 {
+        int ret;
+
+        ret = inet6_add_protocol(&tcpv6_protocol, IPPROTO_TCP);
+        if (ret)
+                goto out;
+
         /* register inet6 protocol */
-        if (inet6_add_protocol(&tcpv6_protocol, IPPROTO_TCP) < 0)
-                printk(KERN_ERR "tcpv6_init: Could not register protocol\n");
-        inet6_register_protosw(&tcpv6_protosw);
+        ret = inet6_register_protosw(&tcpv6_protosw);
+        if (ret)
+                goto out_tcpv6_protocol;
+
+        ret = inet_csk_ctl_sock_create(&tcp6_socket, PF_INET6,
+                                       SOCK_RAW, IPPROTO_TCP);
+        if (ret)
+                goto out_tcpv6_protosw;
+out:
+        return ret;
 
-        if (inet_csk_ctl_sock_create(&tcp6_socket, PF_INET6, SOCK_RAW,
-                                     IPPROTO_TCP) < 0)
-                panic("Failed to create the TCPv6 control socket.\n");
+out_tcpv6_protocol:
+        inet6_del_protocol(&tcpv6_protocol, IPPROTO_TCP);
+out_tcpv6_protosw:
+        inet6_unregister_protosw(&tcpv6_protosw);
+        goto out;
+}
+
+void __exit tcpv6_exit(void)
+{
+        sock_release(tcp6_socket);
+        inet6_unregister_protosw(&tcpv6_protosw);
+        inet6_del_protocol(&tcpv6_protocol, IPPROTO_TCP);
 }