aboutsummaryrefslogtreecommitdiff
path: root/security/smack/smack_netfilter.c
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier@osg.samsung.com>2016-08-08 13:08:25 -0400
committerPaul Moore <paul@paul-moore.com>2016-08-08 13:08:25 -0400
commit1a93a6eac32a2853177f10e274b9b761b42356eb (patch)
treeb73ccb5b91aa686889013f8814b40d8414c4718a /security/smack/smack_netfilter.c
parent29b4817d4018df78086157ea3a55c1d9424a7cfc (diff)
downloadlinux-1a93a6eac32a2853177f10e274b9b761b42356eb.tar.gz
security: Use IS_ENABLED() instead of checking for built-in or module
The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either built-in or as a module, use that macro instead of open coding the same. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Acked-by: Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security/smack/smack_netfilter.c')
-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,