X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=net%2Fipv6%2Faf_inet6.c;h=b0994a49dfca4c55a8385b2aec264f7119be8550;hb=d011a4d861ce583466a8ae72a0c8e7f51c8cba4e;hp=bfa86f040c161233d4dd9192d205ce0ba3976e4f;hpb=544e1cea03e6674e3c12a3b8e8cc507c3dbeaf0c;p=linux-2.6-microblaze.git

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index bfa86f040c16..b0994a49dfca 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -60,6 +60,7 @@
 #ifdef CONFIG_IPV6_TUNNEL
 #include <net/ip6_tunnel.h>
 #endif
+#include <net/calipso.h>
 
 #include <asm/uaccess.h>
 #include <linux/mroute6.h>
@@ -977,6 +978,10 @@ static int __init inet6_init(void)
 	if (err)
 		goto pingv6_fail;
 
+	err = calipso_init();
+	if (err)
+		goto calipso_fail;
+
 #ifdef CONFIG_SYSCTL
 	err = ipv6_sysctl_register();
 	if (err)
@@ -987,8 +992,10 @@ out:
 
 #ifdef CONFIG_SYSCTL
 sysctl_fail:
-	pingv6_exit();
+	calipso_exit();
 #endif
+calipso_fail:
+	pingv6_exit();
 pingv6_fail:
 	ipv6_packet_cleanup();
 ipv6_packet_fail: