summaryrefslogtreecommitdiffstats
path: root/security/smack
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2016-09-19 12:27:10 +1000
committerJames Morris <james.l.morris@oracle.com>2016-09-19 12:27:10 +1000
commitde2f4b3453d29934ceb41eccebd55ab087e17d6c (patch)
treec8f363bd1ddddc5bc382e624d47c507ee956d19d /security/smack
parente350e24694e447e6ab7312fffae5ca31a0bb5165 (diff)
parent9b6a9ecc2d88ccdc57efc22d69436b9dd7e2eceb (diff)
downloadlinux-de2f4b3453d29934ceb41eccebd55ab087e17d6c.tar.bz2
Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/smack')
-rw-r--r--security/smack/smack_netfilter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/smack/smack_netfilter.c b/security/smack/smack_netfilter.c
index aa6bf1b22ec5..205b785fb400 100644
--- a/security/smack/smack_netfilter.c
+++ b/security/smack/smack_netfilter.c
@@ -20,7 +20,7 @@
#include <net/inet_sock.h>
#include "smack.h"
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
static unsigned int smack_ipv6_output(void *priv,
struct sk_buff *skb,
@@ -64,7 +64,7 @@ static struct nf_hook_ops smack_nf_ops[] = {
.hooknum = NF_INET_LOCAL_OUT,
.priority = NF_IP_PRI_SELINUX_FIRST,
},
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
{
.hook = smack_ipv6_output,
.pf = NFPROTO_IPV6,