netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jan Beulich" <JBeulich@novell.com>
To: "Dimitris Michailidis" <dm@chelsio.com>
Cc: <linux-scsi@vger.kernel.org>, <netdev@vger.kernel.org>
Subject: Re: [PATCH] cxgb{3,4}*: improve Kconfig dependencies
Date: Tue, 01 Mar 2011 07:46:32 +0000	[thread overview]
Message-ID: <4D6CB26802000078000343BD@vpn.id2.novell.com> (raw)
In-Reply-To: <1298950455-4497-1-git-send-email-dm@chelsio.com>

>>> On 01.03.11 at 04:34, Dimitris Michailidis <dm@chelsio.com> wrote:
> - 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 <dm@chelsio.com>
> ---
>  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

Forgot to remove INET here?

Besides that,
Acked-by: Jan Beulich <jbeulich@novell.com>

>  	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---





  reply	other threads:[~2011-03-01  7:46 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-01  3:34 [PATCH] cxgb{3,4}*: improve Kconfig dependencies Dimitris Michailidis
2011-03-01  7:46 ` Jan Beulich [this message]
2011-03-01  9:10   ` Dimitris Michailidis
2011-03-01  9:33     ` Jan Beulich
2011-03-03  6:23 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4D6CB26802000078000343BD@vpn.id2.novell.com \
    --to=jbeulich@novell.com \
    --cc=dm@chelsio.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).