OSDN Git Service

net: dsa: Fix dependencies with HSR
authorFlorian Fainelli <f.fainelli@gmail.com>
Sat, 20 Feb 2021 05:12:21 +0000 (21:12 -0800)
committerJakub Kicinski <kuba@kernel.org>
Tue, 23 Feb 2021 02:50:42 +0000 (18:50 -0800)
The core DSA framework uses hsr_is_master() which would not resolve to a
valid symbol if HSR is built-into the kernel and DSA is a module.

Fixes: 18596f504a3e ("net: dsa: add support for offloading HSR")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: George McCollister <george.mccollister@gmail.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Tested-by: Vladimir Oltean <olteanv@gmail.com>
Link: https://lore.kernel.org/r/20210220051222.15672-1-f.fainelli@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/dsa/Kconfig

index a45572c..3589224 100644 (file)
@@ -9,6 +9,7 @@ menuconfig NET_DSA
        tristate "Distributed Switch Architecture"
        depends on HAVE_NET_DSA
        depends on BRIDGE || BRIDGE=n
+       depends on HSR || HSR=n
        select GRO_CELLS
        select NET_SWITCHDEV
        select PHYLINK