1
0
Fork 0
alistair23-linux/net/ncsi
Arnd Bergmann fd0c88b700 net/ncsi: fix ncsi_vlan_rx_{add,kill}_vid references
We get a new link error in allmodconfig kernels after ftgmac100
started using the ncsi helpers:

ERROR: "ncsi_vlan_rx_kill_vid" [drivers/net/ethernet/faraday/ftgmac100.ko] undefined!
ERROR: "ncsi_vlan_rx_add_vid" [drivers/net/ethernet/faraday/ftgmac100.ko] undefined!

Related to that, we get another error when CONFIG_NET_NCSI is disabled:

drivers/net/ethernet/faraday/ftgmac100.c:1626:25: error: 'ncsi_vlan_rx_add_vid' undeclared here (not in a function); did you mean 'ncsi_start_dev'?
drivers/net/ethernet/faraday/ftgmac100.c:1627:26: error: 'ncsi_vlan_rx_kill_vid' undeclared here (not in a function); did you mean 'ncsi_vlan_rx_add_vid'?

This fixes both problems at once, using a 'static inline' stub helper
for the disabled case, and exporting the functions when they are present.

Fixes: 51564585d8 ("ftgmac100: Support NCSI VLAN filtering when available")
Fixes: 21acf63013 ("net/ncsi: Configure VLAN tag filter")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-05 09:11:45 -07:00
..
Kconfig net/ncsi: Resource management 2016-07-19 20:49:16 -07:00
Makefile net/ncsi: NCSI AEN packet handler 2016-07-19 20:49:17 -07:00
internal.h net/ncsi: Configure VLAN tag filter 2017-08-28 16:49:49 -07:00
ncsi-aen.c net/ncsi: Improve HNCDSC AEN handler 2016-10-20 11:23:08 -04:00
ncsi-cmd.c net/ncsi: Fix several packet definitions 2017-08-28 16:49:49 -07:00
ncsi-manage.c net/ncsi: fix ncsi_vlan_rx_{add,kill}_vid references 2017-09-05 09:11:45 -07:00
ncsi-pkt.h net/ncsi: Fix several packet definitions 2017-08-28 16:49:49 -07:00
ncsi-rsp.c net/ncsi: Configure VLAN tag filter 2017-08-28 16:49:49 -07:00