mirror of
https://github.com/torvalds/linux.git
synced 2024-10-31 17:21:49 +00:00
b3422a314c
Commit 82167cb8c6 ('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>
Signed-off-by: David S. Miller <davem@davemloft.net>
40 lines
956 B
Plaintext
40 lines
956 B
Plaintext
menu "Distributed Switch Architecture drivers"
|
|
depends on HAVE_NET_DSA
|
|
|
|
config NET_DSA_MV88E6XXX
|
|
tristate
|
|
default n
|
|
|
|
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
|
|
chip.
|
|
|
|
config NET_DSA_MV88E6XXX_NEED_PPU
|
|
bool
|
|
default n
|
|
|
|
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
|
|
---help---
|
|
This enables support for the Marvell 88E6085/6095/6095F/6131
|
|
ethernet switch chips.
|
|
|
|
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---
|
|
This enables support for the Marvell 88E6123/6161/6165
|
|
ethernet switch chips.
|
|
|
|
endmenu
|