From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
commit f9512d654f62604664251dedd437a22fe484974a upstream.
Fix build errors when BRIDGE=m and SPARX5_SWITCH=y:
riscv64-linux-ld: drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.o: in function `.L305':
sparx5_switchdev.c:(.text+0xdb0): undefined reference to `br_vlan_enabled'
riscv64-linux-ld: drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.o: in function `.L283':
sparx5_switchdev.c:(.text+0xee0): undefined reference to `br_vlan_enabled'
Fixes: 3cfa11bac9bb ("net: sparx5: add the basic sparx5 driver")
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Cc: Horatiu Vultur <horatiu.vultur@xxxxxxxxxxxxx>
Cc: Lars Povlsen <lars.povlsen@xxxxxxxxxxxxx>
Cc: Steen Hegelund <Steen.Hegelund@xxxxxxxxxxxxx>
Cc: UNGLinuxDriver@xxxxxxxxxxxxx
Cc: Paolo Abeni <pabeni@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20220330012025.29560-1-rdunlap@xxxxxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/microchip/sparx5/Kconfig | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/net/ethernet/microchip/sparx5/Kconfig
+++ b/drivers/net/ethernet/microchip/sparx5/Kconfig
@@ -5,6 +5,7 @@ config SPARX5_SWITCH
depends on OF
depends on ARCH_SPARX5 || COMPILE_TEST
depends on PTP_1588_CLOCK_OPTIONAL
+ depends on BRIDGE || BRIDGE=n
select PHYLINK
select PHY_SPARX5_SERDES
select RESET_CONTROLLER
Patches currently in stable-queue which might be from rdunlap@xxxxxxxxxxxxx are
queue-5.15/tomoyo-fix-__setup-handlers-return-values.patch
queue-5.15/evm-fix-the-evm-__setup-handler-return-value.patch
queue-5.15/tty-hvc-fix-return-value-of-__setup-handler.patch
queue-5.15/pm-suspend-fix-return-value-of-__setup-handler.patch
queue-5.15/clocksource-acpi_pm-fix-return-value-of-__setup-hand.patch
queue-5.15/mips-rb532-fix-return-value-of-__setup-handler.patch
queue-5.15/acpi-apei-fix-return-value-of-__setup-handlers.patch
queue-5.15/dma-debug-fix-return-value-of-__setup-handlers.patch
queue-5.15/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch
queue-5.15/m68k-coldfire-device.c-only-build-for-mcf_edma-when-.patch
queue-5.15/printk-fix-return-value-of-printk.devkmsg-__setup-ha.patch
queue-5.15/mips-dec-honor-config_mips_fp_support-n.patch
queue-5.15/net-sparx5-uses-depends-on-bridge-or-bridge.patch
queue-5.15/net-sparx5-depends-on-ptp_1588_clock_optional.patch
queue-5.15/pm-hibernate-fix-__setup-handler-error-handling.patch
queue-5.15/kgdboc-fix-return-value-of-__setup-handler.patch
queue-5.15/driver-core-dd-fix-return-value-of-__setup-handler.patch
queue-5.15/kgdbts-fix-return-value-of-__setup-handler.patch
