diff options
| author | Anish Bhatt <anish@chelsio.com> | 2014-08-12 22:38:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-13 20:04:47 -0700 |
| commit | 8d21797df9ce6537a46ff58e20f359ef05c8faf2 (patch) | |
| tree | b084eea8f12704a69191a57cc13f4be3b0dc54de /drivers/scsi/cxgbi | |
| parent | 7b31b4deda7679120379c005df8d3d647161eff7 (diff) | |
| download | linux-8d21797df9ce6537a46ff58e20f359ef05c8faf2.tar.bz2 | |
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>
Diffstat (limited to 'drivers/scsi/cxgbi')
| -rw-r--r-- | drivers/scsi/cxgbi/cxgb3i/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/scsi/cxgbi/cxgb4i/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/cxgbi/cxgb3i/Kconfig b/drivers/scsi/cxgbi/cxgb3i/Kconfig index 6bbc36fbd6ec..e4603985dce3 100644 --- a/drivers/scsi/cxgbi/cxgb3i/Kconfig +++ b/drivers/scsi/cxgbi/cxgb3i/Kconfig @@ -1,6 +1,6 @@ config SCSI_CXGB3_ISCSI tristate "Chelsio T3 iSCSI support" - depends on PCI && INET + depends on PCI && INET && (IPV6 || IPV6=n) select NETDEVICES select ETHERNET select NET_VENDOR_CHELSIO diff --git a/drivers/scsi/cxgbi/cxgb4i/Kconfig b/drivers/scsi/cxgbi/cxgb4i/Kconfig index 16b2c7d26617..8c4e423037b6 100644 --- a/drivers/scsi/cxgbi/cxgb4i/Kconfig +++ b/drivers/scsi/cxgbi/cxgb4i/Kconfig @@ -1,6 +1,6 @@ config SCSI_CXGB4_ISCSI tristate "Chelsio T4 iSCSI support" - depends on PCI && INET + depends on PCI && INET && (IPV6 || IPV6=n) select NETDEVICES select ETHERNET select NET_VENDOR_CHELSIO |