netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Javier Martinez Canillas <javier@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
	Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
	netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
	Patrick McHardy <kaber@trash.net>,
	James Morris <jmorris@namei.org>,
	Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Subject: [PATCH 4/8] ipv4: use IS_ENABLED() instead of checking for built-in or module
Date: Fri,  9 Sep 2016 08:43:16 -0400	[thread overview]
Message-ID: <1473425000-9782-5-git-send-email-javier@osg.samsung.com> (raw)
In-Reply-To: <1473425000-9782-1-git-send-email-javier@osg.samsung.com>

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

  parent reply	other threads:[~2016-09-09 12:44 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-09 12:43 [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 1/8] appletalk: " Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 2/8] lec: " Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 3/8] net: " Javier Martinez Canillas
2016-09-09 12:43 ` Javier Martinez Canillas [this message]
2016-09-09 12:43 ` [PATCH 5/8] l2tp: " Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 6/8] net: sched: " Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 7/8] sctp: " Javier Martinez Canillas
2016-09-09 16:43   ` Neil Horman
2016-09-09 12:43 ` [PATCH 8/8] xfrm: " Javier Martinez Canillas
2016-09-11  4:19 ` [PATCH 0/8] net: " David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1473425000-9782-5-git-send-email-javier@osg.samsung.com \
    --to=javier@osg.samsung.com \
    --cc=davem@davemloft.net \
    --cc=jmorris@namei.org \
    --cc=kaber@trash.net \
    --cc=kuznet@ms2.inr.ac.ru \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=yoshfuji@linux-ipv6.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).