[PATCH 4/8] ipv4: use IS_ENABLED() instead of checking for built-in or module

From	Javier Martinez Canillas <javier@osg.samsung.com>
Newsgroups	linux.kernel
Subject	[PATCH 4/8] ipv4: use IS_ENABLED() instead of checking for built-in or module
Date	2016-09-09 14:50 +0200
Message-ID	<sftpM-2S8-3@gated-at.bofh.it> (permalink)
References	<sftpM-2S8-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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>
---

 net/ipv4/ip_output.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 65569274efb8..b913f5bf0757 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -490,7 +490,7 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
 	to->tc_index = from->tc_index;
 #endif
 	nf_copy(to, from);
-#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
+#if IS_ENABLED(CONFIG_IP_VS)
 	to->ipvs_property = from->ipvs_property;
 #endif
 	skb_copy_secmark(to, from);
-- 
2.7.4

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 4/8] ipv4: use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas <javier@osg.samsung.com> - 2016-09-09 14:50 +0200

csiph-web