From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92098C433E1 for ; Thu, 14 May 2020 19:08:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7084F20643 for ; Thu, 14 May 2020 19:08:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589483317; bh=Nq/lZfg+QlhWGRQesG+N0mdw+neI0bArwUPu2n8rJ18=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gZ/rq09LH3hZ8hH1W03Wi75OkFOKdTgerI8Z5i5tX22S8nSV8FkJXA4ibzTMJtcBq jHfi/f/ifiorFGcgfk429k7VcUr5FYL4C6FG6Zw+vMkc2SOqHEt+dsVyqB10tz3ktd SkiLYthC8IjQ6PAOBLqQWG2TJErb0VA1IrsV8Vwo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729135AbgENTIb (ORCPT ); Thu, 14 May 2020 15:08:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:52278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728620AbgENSxP (ORCPT ); Thu, 14 May 2020 14:53:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3333A2074A; Thu, 14 May 2020 18:53:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589482395; bh=Nq/lZfg+QlhWGRQesG+N0mdw+neI0bArwUPu2n8rJ18=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d8KfGRWD+wJ/KmxT2Oj9B0WTGKOxyFctOpBIkziYRYYzlMzd94ndxsdQx5EKw09jm YXkB3lrmPPBYNUh8dwM2tdgGDr79NeVKvc2YtRHXfDZUMC5nVXp/nZO+Vl1AKG2Vd1 JdD/sNIqKx38+G0sO+lgNWhm7MmDaOajm6mKVJpA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Masahiro Yamada , Stephen Rothwell , Neil Horman , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 02/49] net: drop_monitor: use IS_REACHABLE() to guard net_dm_hw_report() Date: Thu, 14 May 2020 14:52:23 -0400 Message-Id: <20200514185311.20294-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200514185311.20294-1-sashal@kernel.org> References: <20200514185311.20294-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada [ Upstream commit 1cd9b3abf5332102d4d967555e7ed861a75094bf ] 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 Signed-off-by: Masahiro Yamada Acked-by: Neil Horman Signed-off-by: Sasha Levin --- 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 2ab668461463e..f68bc373544a9 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.20.1