diff options
author | Javier Martinez Canillas <javier@osg.samsung.com> | 2016-09-09 08:43:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-09-10 21:19:10 -0700 |
commit | 6ca40d4e8463c53e6b778010b9331268865725a6 (patch) | |
tree | f862d21a0f26927710972c2e6d617356ca1f1f2e /net | |
parent | 181402a5c7899fad945485130ded47ca2bf1161e (diff) | |
download | linux-stable-6ca40d4e8463c53e6b778010b9331268865725a6.tar.gz linux-stable-6ca40d4e8463c53e6b778010b9331268865725a6.tar.bz2 linux-stable-6ca40d4e8463c53e6b778010b9331268865725a6.zip |
ipv4: 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>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/ip_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |