Commit b3422a31 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

dsa: Hide core config options; make drivers select what they need 



Commit 82167cb8 ('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: default avatarBen Hutchings <bhutchings@solarflare.com>
Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53d6841d

drivers/net/dsa/Kconfig

+4 −0
Original line number Diff line number Diff line 
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---

net/dsa/Kconfig

+13 −17
Original line number Diff line number Diff line 
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

CRA Git | Maintained and supported by SUSTech CRA and CCSE