summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier@osg.samsung.com>2016-09-09 08:43:20 -0400
committerDavid S. Miller <davem@davemloft.net>2016-09-10 21:19:11 -0700
commit65b323e2ffbb05db4136ee822e08a9b0ec6ac716 (patch)
tree66f947ff3d1ab7a5f877ecf8aca7f7c240ad395b
parentaebf5de07aabd44db740c9d33b6daa1abd19fa56 (diff)
downloadlinux-stable-65b323e2ffbb05db4136ee822e08a9b0ec6ac716.tar.gz
linux-stable-65b323e2ffbb05db4136ee822e08a9b0ec6ac716.tar.bz2
linux-stable-65b323e2ffbb05db4136ee822e08a9b0ec6ac716.zip
xfrm: 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. Using the macro makes the code more readable by helping abstract away some of the Kconfig built-in and module enable details. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/xfrm/xfrm_algo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 250e567ba3d6..44ac85fe2bc9 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -17,7 +17,7 @@
#include <linux/crypto.h>
#include <linux/scatterlist.h>
#include <net/xfrm.h>
-#if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE)
+#if IS_ENABLED(CONFIG_INET_ESP) || IS_ENABLED(CONFIG_INET6_ESP)
#include <net/esp.h>
#endif