diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-07-07 10:15:34 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-07-07 10:15:34 +1000 |
| commit | d011a4d861ce583466a8ae72a0c8e7f51c8cba4e (patch) | |
| tree | 1ff8dfe7d486f5648e69ee85e54cde1987d8296a /net/ipv6/af_inet6.c | |
| parent | 544e1cea03e6674e3c12a3b8e8cc507c3dbeaf0c (diff) | |
| parent | 3f09354ac84c6904787189d85fb306bf60f714b8 (diff) | |
| download | lwn-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.tar.gz lwn-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.zip | |
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'net/ipv6/af_inet6.c')
| -rw-r--r-- | net/ipv6/af_inet6.c | 9 |
1 files changed, 8 insertions, 1 deletions
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: |