提交 bd76a116 编写于 作者: J Jiri Pirko 提交者: David S. Miller

dsa: change "select" to "depends on" for NET_SWITCHDEV and for NET_DSA

This would fix randconfig compile error:
net/built-in.o: In function `netdev_switch_fib_ipv4_abort':
(.text+0xf7811): undefined reference to `fib_flush_external'

Also it fixes following warnings:
warning: (NET_DSA) selects NET_SWITCHDEV which has unmet direct dependencies (NET && INET)

warning: (NET_DSA_MV88E6060 && NET_DSA_MV88E6131 && NET_DSA_MV88E6123_61_65 && NET_DSA_MV88E6171 && NET_DSA_MV88E6352 && NET_DSA_BCM_SF2) selects NET_DSA which has unmet direct dependencies (NET && HAVE_NET_DSA && NET_SWITCHDEV)
Reported-by: NRandy Dunlap <rdunlap@infradead.org>
Suggested-by: NAlexei Starovoitov <alexei.starovoitov@gmail.com>
Signed-off-by: NJiri Pirko <jiri@resnulli.us>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 73ee5442
...@@ -7,7 +7,7 @@ config NET_DSA_MV88E6XXX ...@@ -7,7 +7,7 @@ config NET_DSA_MV88E6XXX
config NET_DSA_MV88E6060 config NET_DSA_MV88E6060
tristate "Marvell 88E6060 ethernet switch chip support" tristate "Marvell 88E6060 ethernet switch chip support"
select NET_DSA depends on NET_DSA
select NET_DSA_TAG_TRAILER select NET_DSA_TAG_TRAILER
---help--- ---help---
This enables support for the Marvell 88E6060 ethernet switch This enables support for the Marvell 88E6060 ethernet switch
...@@ -19,7 +19,7 @@ config NET_DSA_MV88E6XXX_NEED_PPU ...@@ -19,7 +19,7 @@ config NET_DSA_MV88E6XXX_NEED_PPU
config NET_DSA_MV88E6131 config NET_DSA_MV88E6131
tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support" tristate "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support"
select NET_DSA depends on NET_DSA
select NET_DSA_MV88E6XXX select NET_DSA_MV88E6XXX
select NET_DSA_MV88E6XXX_NEED_PPU select NET_DSA_MV88E6XXX_NEED_PPU
select NET_DSA_TAG_DSA select NET_DSA_TAG_DSA
...@@ -29,7 +29,7 @@ config NET_DSA_MV88E6131 ...@@ -29,7 +29,7 @@ config NET_DSA_MV88E6131
config NET_DSA_MV88E6123_61_65 config NET_DSA_MV88E6123_61_65
tristate "Marvell 88E6123/6161/6165 ethernet switch chip support" tristate "Marvell 88E6123/6161/6165 ethernet switch chip support"
select NET_DSA depends on NET_DSA
select NET_DSA_MV88E6XXX select NET_DSA_MV88E6XXX
select NET_DSA_TAG_EDSA select NET_DSA_TAG_EDSA
---help--- ---help---
...@@ -38,7 +38,7 @@ config NET_DSA_MV88E6123_61_65 ...@@ -38,7 +38,7 @@ config NET_DSA_MV88E6123_61_65
config NET_DSA_MV88E6171 config NET_DSA_MV88E6171
tristate "Marvell 88E6171/6172 ethernet switch chip support" tristate "Marvell 88E6171/6172 ethernet switch chip support"
select NET_DSA depends on NET_DSA
select NET_DSA_MV88E6XXX select NET_DSA_MV88E6XXX
select NET_DSA_TAG_EDSA select NET_DSA_TAG_EDSA
---help--- ---help---
...@@ -47,7 +47,7 @@ config NET_DSA_MV88E6171 ...@@ -47,7 +47,7 @@ config NET_DSA_MV88E6171
config NET_DSA_MV88E6352 config NET_DSA_MV88E6352
tristate "Marvell 88E6176/88E6352 ethernet switch chip support" tristate "Marvell 88E6176/88E6352 ethernet switch chip support"
select NET_DSA depends on NET_DSA
select NET_DSA_MV88E6XXX select NET_DSA_MV88E6XXX
select NET_DSA_TAG_EDSA select NET_DSA_TAG_EDSA
---help--- ---help---
...@@ -56,8 +56,7 @@ config NET_DSA_MV88E6352 ...@@ -56,8 +56,7 @@ config NET_DSA_MV88E6352
config NET_DSA_BCM_SF2 config NET_DSA_BCM_SF2
tristate "Broadcom Starfighter 2 Ethernet switch support" tristate "Broadcom Starfighter 2 Ethernet switch support"
depends on HAS_IOMEM depends on HAS_IOMEM && NET_DSA
select NET_DSA
select NET_DSA_TAG_BRCM select NET_DSA_TAG_BRCM
select FIXED_PHY select FIXED_PHY
select BCM7XXX_PHY select BCM7XXX_PHY
......
...@@ -6,9 +6,8 @@ config HAVE_NET_DSA ...@@ -6,9 +6,8 @@ config HAVE_NET_DSA
config NET_DSA config NET_DSA
tristate tristate
depends on HAVE_NET_DSA depends on HAVE_NET_DSA && NET_SWITCHDEV
select PHYLIB select PHYLIB
select NET_SWITCHDEV
if NET_DSA if NET_DSA
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册