* [PATCH net-next] dsa: Hide core config options; make drivers select what they need
@ 2012-11-26 19:16 Ben Hutchings
2012-11-26 19:53 ` Randy Dunlap
0 siblings, 1 reply; 3+ messages in thread
From: Ben Hutchings @ 2012-11-26 19:16 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Viresh Kumar, Randy Dunlap
Commit 82167cb8c6b2f8166d5c7532e5ef4b5e0cc46a72 ('net: dsa/slave: Fix
compilation warnings') fixed one possible invalid configuration
(NET_DSA enabled with no trailer formats) but added others: drivers
can select NET_DSA without its dependencies being met.
It's not very useful to make either the DSA core or the tagging
formats manually selectable without a driver to use them, so:
1. Define a hidden HAVE_NET_DSA option and move the dependencies of
NET_DSA to that. While we're at it, drop the deprecated
EXPERIMENTAL dependency.
2. Make NET_DSA and the drivers dependent on HAVE_NET_DSA.
3. Hide the tagging format options again.
4. Make drivers select both NET_DSA and the appropriate tagging format
option.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
drivers/net/dsa/Kconfig | 4 ++++
net/dsa/Kconfig | 30 +++++++++++++-----------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 96eae22..b8fe808 100644
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -1,4 +1,5 @@
menu "Distributed Switch Architecture drivers"
+ depends on HAVE_NET_DSA
config NET_DSA_MV88E6XXX
tristate
@@ -6,6 +7,7 @@ config NET_DSA_MV88E6XXX
config NET_DSA_MV88E6060
tristate "Marvell 88E6060 ethernet switch chip support"
+ select NET_DSA
select NET_DSA_TAG_TRAILER
---help---
This enables support for the Marvell 88E6060 ethernet switch
@@ -17,6 +19,7 @@ config NET_DSA_MV88E6XXX_NEED_PPU
config NET_DSA_MV88E6131
tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support"
+ select NET_DSA
select NET_DSA_MV88E6XXX
select NET_DSA_MV88E6XXX_NEED_PPU
select NET_DSA_TAG_DSA
@@ -26,6 +29,7 @@ config NET_DSA_MV88E6131
config NET_DSA_MV88E6123_61_65
tristate "Marvell 88E6123/6161/6165 ethernet switch chip support"
+ select NET_DSA
select NET_DSA_MV88E6XXX
select NET_DSA_TAG_EDSA
---help---
diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index 0f5dc34..f5eede1 100644
--- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig
@@ -1,28 +1,24 @@
+config HAVE_NET_DSA
+ def_bool y
+ depends on NETDEVICES && !S390
+
+# Drivers must select NET_DSA and the appropriate tagging format
+
config NET_DSA
tristate
- default n
- depends on EXPERIMENTAL && NETDEVICES && !S390
+ depends on HAVE_NET_DSA
select PHYLIB
- ---help---
- This allows you to use hardware switch chips that use
- the Distributed Switch Architecture.
-
-menu "Distributed Switch Architecture support"
+if NET_DSA
# tagging formats
config NET_DSA_TAG_DSA
- bool "Original DSA packet tagging format"
- select NET_DSA
- default n
+ bool
config NET_DSA_TAG_EDSA
- bool "Ethertype DSA packet tagging format"
- select NET_DSA
- default n
+ bool
config NET_DSA_TAG_TRAILER
- bool "Trailer DSA packet tagging format"
- select NET_DSA
- default n
-endmenu
+ bool
+
+endif
--
1.7.7.6
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] dsa: Hide core config options; make drivers select what they need
2012-11-26 19:16 [PATCH net-next] dsa: Hide core config options; make drivers select what they need Ben Hutchings
@ 2012-11-26 19:53 ` Randy Dunlap
2012-11-26 22:11 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Randy Dunlap @ 2012-11-26 19:53 UTC (permalink / raw)
To: Ben Hutchings; +Cc: David Miller, netdev, Viresh Kumar
On 11/26/2012 11:16 AM, Ben Hutchings wrote:
> Commit 82167cb8c6b2f8166d5c7532e5ef4b5e0cc46a72 ('net: dsa/slave: Fix
> compilation warnings') fixed one possible invalid configuration
> (NET_DSA enabled with no trailer formats) but added others: drivers
> can select NET_DSA without its dependencies being met.
>
> It's not very useful to make either the DSA core or the tagging
> formats manually selectable without a driver to use them, so:
>
> 1. Define a hidden HAVE_NET_DSA option and move the dependencies of
> NET_DSA to that. While we're at it, drop the deprecated
> EXPERIMENTAL dependency.
> 2. Make NET_DSA and the drivers dependent on HAVE_NET_DSA.
> 3. Hide the tagging format options again.
> 4. Make drivers select both NET_DSA and the appropriate tagging format
> option.
>
> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Thanks.
> ---
> drivers/net/dsa/Kconfig | 4 ++++
> net/dsa/Kconfig | 30 +++++++++++++-----------------
> 2 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
> index 96eae22..b8fe808 100644
> --- a/drivers/net/dsa/Kconfig
> +++ b/drivers/net/dsa/Kconfig
> @@ -1,4 +1,5 @@
> menu "Distributed Switch Architecture drivers"
> + depends on HAVE_NET_DSA
>
> config NET_DSA_MV88E6XXX
> tristate
> @@ -6,6 +7,7 @@ config NET_DSA_MV88E6XXX
>
> config NET_DSA_MV88E6060
> tristate "Marvell 88E6060 ethernet switch chip support"
> + select NET_DSA
> select NET_DSA_TAG_TRAILER
> ---help---
> This enables support for the Marvell 88E6060 ethernet switch
> @@ -17,6 +19,7 @@ config NET_DSA_MV88E6XXX_NEED_PPU
>
> config NET_DSA_MV88E6131
> tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support"
> + select NET_DSA
> select NET_DSA_MV88E6XXX
> select NET_DSA_MV88E6XXX_NEED_PPU
> select NET_DSA_TAG_DSA
> @@ -26,6 +29,7 @@ config NET_DSA_MV88E6131
>
> config NET_DSA_MV88E6123_61_65
> tristate "Marvell 88E6123/6161/6165 ethernet switch chip support"
> + select NET_DSA
> select NET_DSA_MV88E6XXX
> select NET_DSA_TAG_EDSA
> ---help---
> diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
> index 0f5dc34..f5eede1 100644
> --- a/net/dsa/Kconfig
> +++ b/net/dsa/Kconfig
> @@ -1,28 +1,24 @@
> +config HAVE_NET_DSA
> + def_bool y
> + depends on NETDEVICES && !S390
> +
> +# Drivers must select NET_DSA and the appropriate tagging format
> +
> config NET_DSA
> tristate
> - default n
> - depends on EXPERIMENTAL && NETDEVICES && !S390
> + depends on HAVE_NET_DSA
> select PHYLIB
> - ---help---
> - This allows you to use hardware switch chips that use
> - the Distributed Switch Architecture.
>
> -
> -menu "Distributed Switch Architecture support"
> +if NET_DSA
>
> # tagging formats
> config NET_DSA_TAG_DSA
> - bool "Original DSA packet tagging format"
> - select NET_DSA
> - default n
> + bool
>
> config NET_DSA_TAG_EDSA
> - bool "Ethertype DSA packet tagging format"
> - select NET_DSA
> - default n
> + bool
>
> config NET_DSA_TAG_TRAILER
> - bool "Trailer DSA packet tagging format"
> - select NET_DSA
> - default n
> -endmenu
> + bool
> +
> +endif
--
~Randy
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] dsa: Hide core config options; make drivers select what they need
2012-11-26 19:53 ` Randy Dunlap
@ 2012-11-26 22:11 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2012-11-26 22:11 UTC (permalink / raw)
To: rdunlap; +Cc: bhutchings, netdev, viresh.kumar
From: Randy Dunlap <rdunlap@infradead.org>
Date: Mon, 26 Nov 2012 11:53:20 -0800
> On 11/26/2012 11:16 AM, Ben Hutchings wrote:
>
>> Commit 82167cb8c6b2f8166d5c7532e5ef4b5e0cc46a72 ('net: dsa/slave: Fix
>> compilation warnings') fixed one possible invalid configuration
>> (NET_DSA enabled with no trailer formats) but added others: drivers
>> can select NET_DSA without its dependencies being met.
>>
>> It's not very useful to make either the DSA core or the tagging
>> formats manually selectable without a driver to use them, so:
>>
>> 1. Define a hidden HAVE_NET_DSA option and move the dependencies of
>> NET_DSA to that. While we're at it, drop the deprecated
>> EXPERIMENTAL dependency.
>> 2. Make NET_DSA and the drivers dependent on HAVE_NET_DSA.
>> 3. Hide the tagging format options again.
>> 4. Make drivers select both NET_DSA and the appropriate tagging format
>> option.
>>
>> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
>
> Acked-by: Randy Dunlap <rdunlap@infradead.org>
Applied, thanks everyone.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-26 22:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-26 19:16 [PATCH net-next] dsa: Hide core config options; make drivers select what they need Ben Hutchings
2012-11-26 19:53 ` Randy Dunlap
2012-11-26 22:11 ` David Miller
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).