From patchwork Tue Mar 1 03:34:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitris Michailidis X-Patchwork-Id: 84893 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D741AB7119 for ; Tue, 1 Mar 2011 14:34:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753308Ab1CADeS (ORCPT ); Mon, 28 Feb 2011 22:34:18 -0500 Received: from stargate.chelsio.com ([67.207.112.58]:9317 "EHLO stargate.chelsio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753004Ab1CADeR (ORCPT ); Mon, 28 Feb 2011 22:34:17 -0500 Received: from tom.asicdesigners.com (tom.asicdesigners.com [10.192.167.168]) by stargate.chelsio.com (8.13.1/8.13.1) with ESMTP id p213YGPc006408; Mon, 28 Feb 2011 19:34:16 -0800 Received: from tom.asicdesigners.com (localhost.localdomain [127.0.0.1]) by tom.asicdesigners.com (8.14.4/8.14.3) with ESMTP id p213YFQd004536; Mon, 28 Feb 2011 19:34:16 -0800 Received: (from dm@localhost) by tom.asicdesigners.com (8.14.4/8.14.4/Submit) id p213YFs6004534; Mon, 28 Feb 2011 19:34:15 -0800 From: Dimitris Michailidis To: netdev@vger.kernel.org Cc: linux-scsi@vger.kernel.org, JBeulich@novell.com, Dimitris Michailidis Subject: [PATCH] cxgb{3,4}*: improve Kconfig dependencies Date: Mon, 28 Feb 2011 19:34:15 -0800 Message-Id: <1298950455-4497-1-git-send-email-dm@chelsio.com> X-Mailer: git-send-email 1.7.3.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org - Remove the dependency of cxgb4 and cxgb4vf on INET. cxgb3 really depends on INET, keep it but add it directly to the driver's Kconfig entry. - Make the iSCSI drivers cxgb3i and cxgb4i available in the SCSI menu without requiring any options in the net driver menu to be enabled first. Add needed selects so the iSCSI drivers can build their corresponding net drivers. - Remove CHELSIO_T*_DEPENDS. Signed-off-by: Dimitris Michailidis Acked-by: Jan Beulich --- drivers/net/Kconfig | 21 +++------------------ drivers/scsi/cxgbi/cxgb3i/Kconfig | 4 +++- drivers/scsi/cxgbi/cxgb4i/Kconfig | 4 +++- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index f4b3927..6e09d5f 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2595,14 +2595,9 @@ config CHELSIO_T1_1G Enables support for Chelsio's gigabit Ethernet PCI cards. If you are using only 10G cards say 'N' here. -config CHELSIO_T3_DEPENDS - tristate - depends on PCI && INET - default y - config CHELSIO_T3 tristate "Chelsio Communications T3 10Gb Ethernet support" - depends on CHELSIO_T3_DEPENDS + depends on PCI && INET select FW_LOADER select MDIO help @@ -2620,14 +2615,9 @@ config CHELSIO_T3 To compile this driver as a module, choose M here: the module will be called cxgb3. -config CHELSIO_T4_DEPENDS - tristate - depends on PCI && INET - default y - config CHELSIO_T4 tristate "Chelsio Communications T4 Ethernet support" - depends on CHELSIO_T4_DEPENDS + depends on PCI select FW_LOADER select MDIO help @@ -2645,14 +2635,9 @@ config CHELSIO_T4 To compile this driver as a module choose M here; the module will be called cxgb4. -config CHELSIO_T4VF_DEPENDS - tristate - depends on PCI && INET - default y - config CHELSIO_T4VF tristate "Chelsio Communications T4 Virtual Function Ethernet support" - depends on CHELSIO_T4VF_DEPENDS + depends on PCI help This driver supports Chelsio T4-based gigabit and 10Gb Ethernet adapters with PCI-E SR-IOV Virtual Functions. diff --git a/drivers/scsi/cxgbi/cxgb3i/Kconfig b/drivers/scsi/cxgbi/cxgb3i/Kconfig index 5cf4e98..11dff23 100644 --- a/drivers/scsi/cxgbi/cxgb3i/Kconfig +++ b/drivers/scsi/cxgbi/cxgb3i/Kconfig @@ -1,6 +1,8 @@ config SCSI_CXGB3_ISCSI tristate "Chelsio T3 iSCSI support" - depends on CHELSIO_T3_DEPENDS + depends on PCI && INET + select NETDEVICES + select NETDEV_10000 select CHELSIO_T3 select SCSI_ISCSI_ATTRS ---help--- diff --git a/drivers/scsi/cxgbi/cxgb4i/Kconfig b/drivers/scsi/cxgbi/cxgb4i/Kconfig index bb94b39..d5302c2 100644 --- a/drivers/scsi/cxgbi/cxgb4i/Kconfig +++ b/drivers/scsi/cxgbi/cxgb4i/Kconfig @@ -1,6 +1,8 @@ config SCSI_CXGB4_ISCSI tristate "Chelsio T4 iSCSI support" - depends on CHELSIO_T4_DEPENDS + depends on PCI && INET + select NETDEVICES + select NETDEV_10000 select CHELSIO_T4 select SCSI_ISCSI_ATTRS ---help---