[net-next] nfp: add MAY_USE_DEVLINK dependency

Message ID 20170531081700.1948289-1-arnd@arndb.de
State New
Headers show

Commit Message

Arnd Bergmann May 31, 2017, 8:16 a.m.
When devlink is configured as a loadable module, a built-in nfp driver
causes a link error:

drivers/net/built-in.o: In function `nfp_devlink_port_register':
(.text+0xb8b05): undefined reference to `devlink_port_type_eth_set'
drivers/net/built-in.o: In function `nfp_devlink_port_register':
(.text+0xb8b16): undefined reference to `devlink_port_split_set'

This adds a special Kconfig dependency on CONFIG_MAY_USE_DEVLINK
to avoid that combination and force nfp to be a module when NET_DEVLINK=m.

Fixes: 1851f93fd2ee ("nfp: add devlink support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

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

-- 
2.9.0

Comments

Jakub Kicinski May 31, 2017, 8:57 a.m. | #1
On Wed, 31 May 2017 10:16:50 +0200, Arnd Bergmann wrote:
> When devlink is configured as a loadable module, a built-in nfp driver

> causes a link error:

> 

> drivers/net/built-in.o: In function `nfp_devlink_port_register':

> (.text+0xb8b05): undefined reference to `devlink_port_type_eth_set'

> drivers/net/built-in.o: In function `nfp_devlink_port_register':

> (.text+0xb8b16): undefined reference to `devlink_port_split_set'

> 

> This adds a special Kconfig dependency on CONFIG_MAY_USE_DEVLINK

> to avoid that combination and force nfp to be a module when NET_DEVLINK=m.


Thanks, this should be fixed in net-next already by commit 
d935bc84c940 ("nfp: add MAY_USE_DEVLINK dependency").  Same 
subject/commit title as yours :)

Patch hide | download patch | download mbox

diff --git a/drivers/net/ethernet/netronome/Kconfig b/drivers/net/ethernet/netronome/Kconfig
index 967d7ca8c28c..0d5a7b9203a4 100644
--- a/drivers/net/ethernet/netronome/Kconfig
+++ b/drivers/net/ethernet/netronome/Kconfig
@@ -19,6 +19,7 @@  config NFP
 	tristate "Netronome(R) NFP4000/NFP6000 NIC driver"
 	depends on PCI && PCI_MSI
 	depends on VXLAN || VXLAN=n
+	depends on MAY_USE_DEVLINK
 	---help---
 	  This driver supports the Netronome(R) NFP4000/NFP6000 based
 	  cards working as a advanced Ethernet NIC.  It works with both