diff options
author | Javier Martinez Canillas <javier@osg.samsung.com> | 2016-08-08 19:08:25 +0200 |
---|---|---|
committer | Paul Moore <paul@paul-moore.com> | 2016-08-08 19:08:25 +0200 |
commit | 1a93a6eac32a2853177f10e274b9b761b42356eb (patch) | |
tree | b73ccb5b91aa686889013f8814b40d8414c4718a /security/smack | |
parent | Linux 4.8-rc1 (diff) | |
download | linux-1a93a6eac32a2853177f10e274b9b761b42356eb.tar.xz linux-1a93a6eac32a2853177f10e274b9b761b42356eb.zip |
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')
-rw-r--r-- | security/smack/smack_netfilter.c | 4 |
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, |