diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-15 17:45:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-15 17:45:23 -0400 |
| commit | fe42048e2a7a2b96acf1c60c7b0eb8ad14e00f44 (patch) | |
| tree | f7bf9d856db7fed8f823a097567d5b8a3d396132 | |
| parent | d6ce2628f32271c037a8c12e1994c9fba3a4af49 (diff) | |
| parent | 23a3c99201954d8ffe92e599e3c3039985280f1b (diff) | |
Merge branch 'bnx2-deps'
Anish Bhatt says:
====================
net: Fix randconfig errros in bnx2i/bnx2fc caused by IPV6
Just like CNIC bnx2i/bnx2fc also have their tristate dependent on IPV6, however
using the same solution as CNIC can cause recursive dependecies during make.
Based on suggestions by Randy Dunlap, SCSI_NETLINK now depends on NET instead
of selecting NET. Second patch fixes the actual randconfig error.
Entire thread can be followed here : https://lkml.org/lkml/2014/9/9/500
Fixes: c99d667e8527 ("cnic : Cleanup CONFIG_IPV6 & VLAN check")
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/scsi/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/scsi/bnx2fc/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/scsi/bnx2i/Kconfig | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 18a3358eb1d4..756cddaf6c6d 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -43,7 +43,7 @@ config SCSI_DMA config SCSI_NETLINK bool default n - select NET + depends on NET config SCSI_PROC_FS bool "legacy /proc/scsi/ support" diff --git a/drivers/scsi/bnx2fc/Kconfig b/drivers/scsi/bnx2fc/Kconfig index f245d543d7b1..02b0ba8e49e9 100644 --- a/drivers/scsi/bnx2fc/Kconfig +++ b/drivers/scsi/bnx2fc/Kconfig @@ -1,6 +1,7 @@ config SCSI_BNX2X_FCOE tristate "QLogic NetXtreme II FCoE support" depends on PCI + depends on (IPV6 || IPV6=n) select NETDEVICES select ETHERNET select NET_VENDOR_BROADCOM diff --git a/drivers/scsi/bnx2i/Kconfig b/drivers/scsi/bnx2i/Kconfig index 44ce54e536e5..ba30ff86d581 100644 --- a/drivers/scsi/bnx2i/Kconfig +++ b/drivers/scsi/bnx2i/Kconfig @@ -2,6 +2,7 @@ config SCSI_BNX2_ISCSI tristate "QLogic NetXtreme II iSCSI support" depends on NET depends on PCI + depends on (IPV6 || IPV6=n) select SCSI_ISCSI_ATTRS select NETDEVICES select ETHERNET |