diff mbox series

[net-next] net: systemport: add NET_DSA dependency

Message ID 20171016113258.3735473-1-arnd@arndb.de
State Accepted
Commit 00fb3a7c7c14dd28feb0372a8458267e058add66
Headers show
Series [net-next] net: systemport: add NET_DSA dependency | expand

Commit Message

Arnd Bergmann Oct. 16, 2017, 11:32 a.m. UTC
The notifier cause a link error when NET_DSA is a loadable
module:

drivers/net/ethernet/broadcom/bcmsysport.o: In function `bcm_sysport_remove':
bcmsysport.c:(.text+0x1582): undefined reference to `unregister_dsa_notifier'
drivers/net/ethernet/broadcom/bcmsysport.o: In function `bcm_sysport_probe':
bcmsysport.c:(.text+0x278d): undefined reference to `register_dsa_notifier'

This adds a dependency that forces the systemport driver to be
a loadable module as well when that happens, but otherwise
allows it to be built normally when DSA is either built-in or
completely disabled.

Fixes: d156576362c0 ("net: systemport: Establish lower/upper queue mapping")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/net/ethernet/broadcom/Kconfig | 1 +
 1 file changed, 1 insertion(+)

-- 
2.9.0

Comments

Florian Fainelli Oct. 16, 2017, 5:55 p.m. UTC | #1
On 10/16/2017 04:32 AM, Arnd Bergmann wrote:
> The notifier cause a link error when NET_DSA is a loadable

> module:

> 

> drivers/net/ethernet/broadcom/bcmsysport.o: In function `bcm_sysport_remove':

> bcmsysport.c:(.text+0x1582): undefined reference to `unregister_dsa_notifier'

> drivers/net/ethernet/broadcom/bcmsysport.o: In function `bcm_sysport_probe':

> bcmsysport.c:(.text+0x278d): undefined reference to `register_dsa_notifier'

> 

> This adds a dependency that forces the systemport driver to be

> a loadable module as well when that happens, but otherwise

> allows it to be built normally when DSA is either built-in or

> completely disabled.

> 

> Fixes: d156576362c0 ("net: systemport: Establish lower/upper queue mapping")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>


Thanks Arnd.
-- 
Florian
David Miller Oct. 16, 2017, 8:21 p.m. UTC | #2
From: Arnd Bergmann <arnd@arndb.de>

Date: Mon, 16 Oct 2017 13:32:36 +0200

> The notifier cause a link error when NET_DSA is a loadable

> module:

> 

> drivers/net/ethernet/broadcom/bcmsysport.o: In function `bcm_sysport_remove':

> bcmsysport.c:(.text+0x1582): undefined reference to `unregister_dsa_notifier'

> drivers/net/ethernet/broadcom/bcmsysport.o: In function `bcm_sysport_probe':

> bcmsysport.c:(.text+0x278d): undefined reference to `register_dsa_notifier'

> 

> This adds a dependency that forces the systemport driver to be

> a loadable module as well when that happens, but otherwise

> allows it to be built normally when DSA is either built-in or

> completely disabled.

> 

> Fixes: d156576362c0 ("net: systemport: Establish lower/upper queue mapping")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Applied, thank you.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index 67134ece1107..af75156919ed 100644
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -184,6 +184,7 @@  config BGMAC_PLATFORM
 config SYSTEMPORT
 	tristate "Broadcom SYSTEMPORT internal MAC support"
 	depends on OF
+	depends on NET_DSA || !NET_DSA
 	select MII
 	select PHYLIB
 	select FIXED_PHY