Skip to contentSkip to conversation

scsi: fix SCSI_BNX2X_FCOE dependencies and build errors

PATCH In review Randy Dunlap 2 participants 2 messages Sep 19, 2014

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: fix SCSI_BNX2X_FCOE dependencies and build errors

From: Randy Dunlap <[email protected]>

Don't enable NETDEVICES when NET is not enabled. That causes build warnings and errors.

warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2X_FCOE) selects NETDEVICES which has unmet direct dependencies (NET)
warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2_ISCSI && SCSI_BNX2X_FCOE) selects ETHERNET which has unmet direct dependencies (NETDEVICES && NET)
warning: (SCSI_BNX2X_FCOE && LIBFCOE && TCM_QLA2XXX) selects LIBFC which has unmet direct dependencies (SCSI_LOWLEVEL && SCSI && SCSI_FC_ATTRS)

../drivers/net/ethernet/cisco/enic/enic_main.c: In function 'enic_rq_indicate_buf':
../drivers/net/ethernet/cisco/enic/enic_main.c:1077:3: error: implicit declaration of function 'skb_mark_napi_id' [-Werror=implicit-function-declaration] ../drivers/net/ethernet/cisco/enic/enic_main.c:1078:3: error: implicit declaration of function 'enic_poll_busy_polling' [-Werror=implicit-function-declaration]

---
 drivers/scsi/bnx2fc/Kconfig |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/bnx2fc/Kconfig +2 -1
@@ -1,7 +1,8 @@
 config SCSI_BNX2X_FCOE
 	tristate "QLogic NetXtreme II FCoE support"
-	depends on PCI
+	depends on PCI && NET
 	depends on (IPV6 || IPV6=n)
+	depends on SCSI_FC_ATTRS
 	select NETDEVICES
 	select ETHERNET
 	select NET_VENDOR_BROADCOM
Tested-by on v1 1/1
#1 lore raw

Leaves only 1 warning still reproduceable :
(LIBFCOE && TCM_QLA2XXX) selects LIBFC which has unmet direct dependencies (SCSI_LOWLEVEL && SCSI && SCSI_FC_ATTRS),
so maybe that needs a fix too ? All the other fcoe/scsi menu entries behave
as expected.

________________________________________
From: Randy Dunlap [[email protected]]
Sent: Friday, September 19, 2014 3:38 PM
To: [email protected]; David Miller
Cc: LKML; Anish Bhatt; James Bottomley
Subject: [PATCH] scsi: fix SCSI_BNX2X_FCOE dependencies and build errors

From: Randy Dunlap <[email protected]>

Don't enable NETDEVICES when NET is not enabled. That causes build warnings and errors.

warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2X_FCOE) selects NETDEVICES which has unmet direct dependencies (NET)
warning: (SCSI_CXGB3_ISCSI && SCSI_CXGB4_ISCSI && SCSI_BNX2_ISCSI && SCSI_BNX2X_FCOE) selects ETHERNET which has unmet direct dependencies (NETDEVICES && NET)
warning: (SCSI_BNX2X_FCOE && LIBFCOE && TCM_QLA2XXX) selects LIBFC which has unmet direct dependencies (SCSI_LOWLEVEL && SCSI && SCSI_FC_ATTRS)

../drivers/net/ethernet/cisco/enic/enic_main.c: In function 'enic_rq_indicate_buf':
../drivers/net/ethernet/cisco/enic/enic_main.c:1077:3: error: implicit declaration of function 'skb_mark_napi_id' [-Werror=implicit-function-declaration] ../drivers/net/ethernet/cisco/enic/enic_main.c:1078:3: error: implicit declaration of function 'enic_poll_busy_polling' [-Werror=implicit-function-declaration]

---
 drivers/scsi/bnx2fc/Kconfig |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/bnx2fc/Kconfig +2 -1
@@ -1,7 +1,8 @@
 config SCSI_BNX2X_FCOE
        tristate "QLogic NetXtreme II FCoE support"
-       depends on PCI
+       depends on PCI && NET
        depends on (IPV6 || IPV6=n)
+       depends on SCSI_FC_ATTRS
        select NETDEVICES
        select ETHERNET
        select NET_VENDOR_BROADCOM