summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2021-02-20 06:12:21 +0100
committerJakub Kicinski <kuba@kernel.org>2021-02-23 03:50:42 +0100
commit94ead4caa0615f4b0719ffcb4dbd0907fe2f9265 (patch)
tree789ca821a70fbc407599485bb68cf80c03aaddc0 /net
parentnet: phy: icplus: call phy_restore_page() when phy_select_page() fails (diff)
downloadlinux-94ead4caa0615f4b0719ffcb4dbd0907fe2f9265.tar.xz
linux-94ead4caa0615f4b0719ffcb4dbd0907fe2f9265.zip
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 <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>
Diffstat (limited to 'net')
-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