Commit fe42048e authored by David S. Miller's avatar David S. Miller
Browse files

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: c99d667e ("cnic : Cleanup CONFIG_IPV6 & VLAN check")
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d6ce2628 23a3c992

drivers/scsi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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"

drivers/scsi/bnx2fc/Kconfig

+1 −0
Original line number Diff line number Diff line 
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

drivers/scsi/bnx2i/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE