From: Masahiro Yamada <masahiroy@kernel.org>
To: Neil Horman <nhorman@tuxdriver.com>,
netdev@vger.kernel.org, "David S . Miller" <davem@davemloft.net>
Cc: Ido Schimmel <idosch@mellanox.com>,
Jiri Pirko <jiri@mellanox.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Nicolas Pitre <nico@fluxnic.net>,
linux-kbuild@vger.kernel.org,
Masahiro Yamada <masahiroy@kernel.org>,
Jakub Kicinski <kuba@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH] net: drop_monitor: use IS_REACHABLE() to guard net_dm_hw_report()
Date: Wed, 11 Mar 2020 15:29:25 +0900 [thread overview]
Message-ID: <20200311062925.5163-1-masahiroy@kernel.org> (raw)
In net/Kconfig, NET_DEVLINK implies NET_DROP_MONITOR.
The original behavior of the 'imply' keyword prevents NET_DROP_MONITOR
from being 'm' when NET_DEVLINK=y.
With the planned Kconfig change that relaxes the 'imply', the
combination of NET_DEVLINK=y and NET_DROP_MONITOR=m would be allowed.
Use IS_REACHABLE() to avoid the vmlinux link error for this case.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
This build error was reported in linux-next.
https://lkml.org/lkml/2020/3/10/1936
If this patch is acceptable,
I'd like to get Ack from the maintainers,
and insert this patch before my Kconfig change.
include/net/drop_monitor.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/net/drop_monitor.h b/include/net/drop_monitor.h
index 2ab668461463..f68bc373544a 100644
--- a/include/net/drop_monitor.h
+++ b/include/net/drop_monitor.h
@@ -19,7 +19,7 @@ struct net_dm_hw_metadata {
struct net_device *input_dev;
};
-#if IS_ENABLED(CONFIG_NET_DROP_MONITOR)
+#if IS_REACHABLE(CONFIG_NET_DROP_MONITOR)
void net_dm_hw_report(struct sk_buff *skb,
const struct net_dm_hw_metadata *hw_metadata);
#else
--
2.17.1
next reply other threads:[~2020-03-11 6:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-11 6:29 Masahiro Yamada [this message]
2020-03-11 9:31 ` [PATCH] net: drop_monitor: use IS_REACHABLE() to guard net_dm_hw_report() Ido Schimmel
2020-03-11 10:47 ` Neil Horman
2020-03-11 11:28 ` Ido Schimmel
2020-03-11 17:30 ` Neil Horman
2020-03-11 21:26 ` Masahiro Yamada
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=20200311062925.5163-1-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=davem@davemloft.net \
--cc=idosch@mellanox.com \
--cc=jiri@mellanox.com \
--cc=kuba@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=nico@fluxnic.net \
--cc=sfr@canb.auug.org.au \
/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).