From: Javier Martinez Canillas <javier@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
Nikolay Aleksandrov <nikolay@cumulusnetworks.com>,
Alexander Duyck <aduyck@mirantis.com>,
Tom Herbert <tom@herbertland.com>, Jiri Pirko <jiri@mellanox.com>,
"David S. Miller" <davem@davemloft.net>,
Jarod Wilson <jarod@redhat.com>, Paolo Abeni <pabeni@redhat.com>,
netdev@vger.kernel.org, Daniel Borkmann <daniel@iogearbox.net>,
Eric Dumazet <edumazet@google.com>
Subject: [PATCH 3/8] net: use IS_ENABLED() instead of checking for built-in or module
Date: Fri, 9 Sep 2016 08:43:15 -0400 [thread overview]
Message-ID: <1473425000-9782-4-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/core/dev.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index c7d7db49826d..9e76d4df6ca0 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3904,8 +3904,7 @@ static __latent_entropy void net_tx_action(struct softirq_action *h)
}
}
-#if (defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)) && \
- (defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE))
+#if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_ATM_LANE)
/* This hook is defined here for ATM LANE */
int (*br_fdb_test_addr_hook)(struct net_device *dev,
unsigned char *addr) __read_mostly;
--
2.7.4
next prev parent reply other threads:[~2016-09-09 12:43 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 ` Javier Martinez Canillas [this message]
2016-09-09 12:43 ` [PATCH 4/8] ipv4: " Javier Martinez Canillas
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-4-git-send-email-javier@osg.samsung.com \
--to=javier@osg.samsung.com \
--cc=aduyck@mirantis.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jarod@redhat.com \
--cc=jiri@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@cumulusnetworks.com \
--cc=pabeni@redhat.com \
--cc=tom@herbertland.com \
/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).