Skip to content

Commit fe42048

Browse files
davem330davem330
committed
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: c99d667 ("cnic : Cleanup CONFIG_IPV6 & VLAN check") ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents d6ce262 + 23a3c99 commit fe42048

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

‎drivers/scsi/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ config SCSI_DMA
4343
config SCSI_NETLINK
4444
bool
4545
default n
46-
select NET
46+
depends on NET
4747

4848
config SCSI_PROC_FS
4949
bool "legacy /proc/scsi/ support"

‎drivers/scsi/bnx2fc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
config SCSI_BNX2X_FCOE
22
tristate "QLogic NetXtreme II FCoE support"
33
depends on PCI
4+
depends on (IPV6 || IPV6=n)
45
select NETDEVICES
56
select ETHERNET
67
select NET_VENDOR_BROADCOM

‎drivers/scsi/bnx2i/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ config SCSI_BNX2_ISCSI
22
tristate "QLogic NetXtreme II iSCSI support"
33
depends on NET
44
depends on PCI
5+
depends on (IPV6 || IPV6=n)
56
select SCSI_ISCSI_ATTRS
67
select NETDEVICES
78
select ETHERNET

0 commit comments

Comments
 (0)