aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fainelli <[email protected]>2021-02-19 21:12:21 -0800
committerJakub Kicinski <[email protected]>2021-02-22 18:50:42 -0800
commit94ead4caa0615f4b0719ffcb4dbd0907fe2f9265 (patch)
tree789ca821a70fbc407599485bb68cf80c03aaddc0
parent4e9d9d1f4880ad358a8e5eb6ac4c811fd76dd617 (diff)
net: dsa: Fix dependencies with HSR
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 <[email protected]> Signed-off-by: Florian Fainelli <[email protected]> Reviewed-by: George McCollister <[email protected]> Reviewed-by: Vladimir Oltean <[email protected]> Tested-by: Vladimir Oltean <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
-rw-r--r--net/dsa/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index a45572cfb71a..3589224c8da9 100644
--- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig
@@ -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