瀏覽代碼

libcxgbi/cxgb4i : Fix ipv6 build failure caught with randconfig

Previous guard of IS_ENABLED(CONFIG_IPV6) is not sufficient when cxgbi drivers
are built into kernel but ipv6 is not.

v2: Use Kconfig to disable compiling cxgbi built into kernel when ipv6 is
compiled as a module

Fixes: e81fbf6cd652 ("libcxgbi:cxgb4i Guard ipv6 code with a config check")
Fixes: fc8d0590d914 ("libcxgbi: Add ipv6 api to driver")
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Anish Bhatt 11 年之前
父節點
當前提交
8d21797df9
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/scsi/cxgbi/cxgb3i/Kconfig
  2. 1 1
      drivers/scsi/cxgbi/cxgb4i/Kconfig

+ 1 - 1
drivers/scsi/cxgbi/cxgb3i/Kconfig

@@ -1,6 +1,6 @@
 config SCSI_CXGB3_ISCSI
 config SCSI_CXGB3_ISCSI
 	tristate "Chelsio T3 iSCSI support"
 	tristate "Chelsio T3 iSCSI support"
-	depends on PCI && INET
+	depends on PCI && INET && (IPV6 || IPV6=n)
 	select NETDEVICES
 	select NETDEVICES
 	select ETHERNET
 	select ETHERNET
 	select NET_VENDOR_CHELSIO
 	select NET_VENDOR_CHELSIO

+ 1 - 1
drivers/scsi/cxgbi/cxgb4i/Kconfig

@@ -1,6 +1,6 @@
 config SCSI_CXGB4_ISCSI
 config SCSI_CXGB4_ISCSI
 	tristate "Chelsio T4 iSCSI support"
 	tristate "Chelsio T4 iSCSI support"
-	depends on PCI && INET
+	depends on PCI && INET && (IPV6 || IPV6=n)
 	select NETDEVICES
 	select NETDEVICES
 	select ETHERNET
 	select ETHERNET
 	select NET_VENDOR_CHELSIO
 	select NET_VENDOR_CHELSIO