lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 102/606] net: drop_monitor: use IS_REACHABLE() to guard net_dm_hw_report()
    Date
    From: Masahiro Yamada <masahiroy@kernel.org>

    [ 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 <sfr@canb.auug.org.au>
    Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
    Acked-by: Neil Horman <nhorman@tuxdriver.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:36    [W:4.026 / U:0.420 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site