* [PATCH] cxgb{3,4}*: improve Kconfig dependencies
@ 2011-03-01 3:34 Dimitris Michailidis
2011-03-01 7:46 ` Jan Beulich
2011-03-03 6:23 ` David Miller
0 siblings, 2 replies; 7+ messages in thread
From: Dimitris Michailidis @ 2011-03-01 3:34 UTC (permalink / raw)
To: netdev; +Cc: linux-scsi, JBeulich, Dimitris Michailidis
- 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
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---
--
1.7.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] cxgb{3,4}*: improve Kconfig dependencies
2011-03-01 3:34 [PATCH] cxgb{3,4}*: improve Kconfig dependencies Dimitris Michailidis
@ 2011-03-01 7:46 ` Jan Beulich
2011-03-03 6:23 ` David Miller
1 sibling, 0 replies; 7+ messages in thread
From: Jan Beulich @ 2011-03-01 7:46 UTC (permalink / raw)
To: Dimitris Michailidis; +Cc: linux-scsi, netdev
>>> 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---
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] cxgb{3,4}*: improve Kconfig dependencies
@ 2011-03-01 7:46 ` Jan Beulich
0 siblings, 0 replies; 7+ messages in thread
From: Jan Beulich @ 2011-03-01 7:46 UTC (permalink / raw)
To: Dimitris Michailidis; +Cc: linux-scsi, netdev
>>> 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---
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] cxgb{3,4}*: improve Kconfig dependencies
2011-03-01 7:46 ` Jan Beulich
(?)
@ 2011-03-01 9:10 ` Dimitris Michailidis
2011-03-01 9:33 ` Jan Beulich
-1 siblings, 1 reply; 7+ messages in thread
From: Dimitris Michailidis @ 2011-03-01 9:10 UTC (permalink / raw)
To: Jan Beulich; +Cc: linux-scsi, netdev
Jan Beulich wrote:
>>>> 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?
Didn't forget it, this driver has a real dependency on INET (ARP more
specifically). I mentioned it also in the commit message.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] cxgb{3,4}*: improve Kconfig dependencies
2011-03-01 9:10 ` Dimitris Michailidis
@ 2011-03-01 9:33 ` Jan Beulich
0 siblings, 0 replies; 7+ messages in thread
From: Jan Beulich @ 2011-03-01 9:33 UTC (permalink / raw)
To: Dimitris Michailidis; +Cc: linux-scsi, netdev
>>> On 01.03.11 at 10:10, Dimitris Michailidis <dm@chelsio.com> wrote:
> Jan Beulich wrote:
>>>>> 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?
>
> Didn't forget it, this driver has a real dependency on INET (ARP more
> specifically). I mentioned it also in the commit message.
Oh, sorry, must have read this too quickly.
Jan
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] cxgb{3,4}*: improve Kconfig dependencies
@ 2011-03-01 9:33 ` Jan Beulich
0 siblings, 0 replies; 7+ messages in thread
From: Jan Beulich @ 2011-03-01 9:33 UTC (permalink / raw)
To: Dimitris Michailidis; +Cc: linux-scsi, netdev
>>> On 01.03.11 at 10:10, Dimitris Michailidis <dm@chelsio.com> wrote:
> Jan Beulich wrote:
>>>>> 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?
>
> Didn't forget it, this driver has a real dependency on INET (ARP more
> specifically). I mentioned it also in the commit message.
Oh, sorry, must have read this too quickly.
Jan
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] cxgb{3,4}*: improve Kconfig dependencies
2011-03-01 3:34 [PATCH] cxgb{3,4}*: improve Kconfig dependencies Dimitris Michailidis
2011-03-01 7:46 ` Jan Beulich
@ 2011-03-03 6:23 ` David Miller
1 sibling, 0 replies; 7+ messages in thread
From: David Miller @ 2011-03-03 6:23 UTC (permalink / raw)
To: dm; +Cc: netdev, linux-scsi, JBeulich
From: Dimitris Michailidis <dm@chelsio.com>
Date: Mon, 28 Feb 2011 19:34:15 -0800
> - 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>
Applied to net-next-2.6, thanks!
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-03-03 6:22 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-01 3:34 [PATCH] cxgb{3,4}*: improve Kconfig dependencies Dimitris Michailidis
2011-03-01 7:46 ` Jan Beulich
2011-03-01 7:46 ` Jan Beulich
2011-03-01 9:10 ` Dimitris Michailidis
2011-03-01 9:33 ` Jan Beulich
2011-03-01 9:33 ` Jan Beulich
2011-03-03 6:23 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.