iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cxgb4 : Fix build failure in cxgb4 when ipv6 is disabled/not in-built

Browse Source 
cxgb4 ipv6 does not guard against ipv6 being disabled, or the standard
ipv6 module vs inbuilt tri-state issue. This was fixed for cxgb4i & iw_cxgb4
but missed for cxgb4.

Signed-off-by: Anish Bhatt <anish@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Anish Bhatt 2014-10-14 20:07:22 -07:00 committed by David S. Miller
parent 587ddfe2d2
commit 1bb60376cd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/chelsio/Kconfig
View File

@ -68,7 +68,7 @@ config CHELSIO_T3
config CHELSIO_T4 config CHELSIO_T4
tristate "Chelsio Communications T4/T5 Ethernet support" tristate "Chelsio Communications T4/T5 Ethernet support"
depends on PCI depends on PCI && (IPV6 || IPV6=n)
select FW_LOADER select FW_LOADER
select MDIO select MDIO
---help--- ---help---

8
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
View File

@ -4369,6 +4369,7 @@ EXPORT_SYMBOL(cxgb4_unregister_uld);
* success (true) if it belongs otherwise failure (false). * success (true) if it belongs otherwise failure (false).
* Called with rcu_read_lock() held. * Called with rcu_read_lock() held.
*/ */
#if IS_ENABLED(CONFIG_IPV6)
static bool cxgb4_netdev(const struct net_device *netdev) static bool cxgb4_netdev(const struct net_device *netdev)
{ {
struct adapter *adap; struct adapter *adap;
@ -4529,6 +4530,7 @@ static void update_clip(const struct adapter *adap)
} }
rcu_read_unlock(); rcu_read_unlock();
} }
#endif /* IS_ENABLED(CONFIG_IPV6) */
/** /**
* cxgb_up - enable the adapter * cxgb_up - enable the adapter
@ -4575,7 +4577,9 @@ static int cxgb_up(struct adapter *adap)
t4_intr_enable(adap); t4_intr_enable(adap);
adap->flags |= FULL_INIT_DONE; adap->flags |= FULL_INIT_DONE;
notify_ulds(adap, CXGB4_STATE_UP); notify_ulds(adap, CXGB4_STATE_UP);
#if IS_ENABLED(CONFIG_IPV6)
update_clip(adap); update_clip(adap);
#endif
out: out:
return err; return err;
irq_err: irq_err:
@ -6869,14 +6873,18 @@ static int __init cxgb4_init_module(void)
if (ret < 0) if (ret < 0)
debugfs_remove(cxgb4_debugfs_root); debugfs_remove(cxgb4_debugfs_root);
#if IS_ENABLED(CONFIG_IPV6)
register_inet6addr_notifier(&cxgb4_inet6addr_notifier); register_inet6addr_notifier(&cxgb4_inet6addr_notifier);
#endif
return ret; return ret;
} }
static void __exit cxgb4_cleanup_module(void) static void __exit cxgb4_cleanup_module(void)
{ {
#if IS_ENABLED(CONFIG_IPV6)
unregister_inet6addr_notifier(&cxgb4_inet6addr_notifier); unregister_inet6addr_notifier(&cxgb4_inet6addr_notifier);
#endif
pci_unregister_driver(&cxgb4_driver); pci_unregister_driver(&cxgb4_driver);
debugfs_remove(cxgb4_debugfs_root); /* NULL ok */ debugfs_remove(cxgb4_debugfs_root); /* NULL ok */
} }