diff mbox series

net: Always descend into dsa/

Message ID 20190513210624.10876-1-f.fainelli@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series net: Always descend into dsa/ | expand

Commit Message

Florian Fainelli May 13, 2019, 9:06 p.m. UTC
Jiri reported that with a kernel built with CONFIG_FIXED_PHY=y,
CONFIG_NET_DSA=m and CONFIG_NET_DSA_LOOP=m, we would not get to a
functional state where the mock-up driver is registered. Turns out that
we are not descending into drivers/net/dsa/ unconditionally, and we
won't be able to link-in dsa_loop_bdinfo.o which does the actual mock-up
mdio device registration.

Reported-by: Jiri Pirko <jiri@resnulli.us>
Fixes: 40013ff20b1b ("net: dsa: Fix functional dsa-loop dependency on FIXED_PHY")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Vivien Didelot May 13, 2019, 11:29 p.m. UTC | #1
On Mon, 13 May 2019 14:06:24 -0700, Florian Fainelli <f.fainelli@gmail.com> wrote:
> Jiri reported that with a kernel built with CONFIG_FIXED_PHY=y,
> CONFIG_NET_DSA=m and CONFIG_NET_DSA_LOOP=m, we would not get to a
> functional state where the mock-up driver is registered. Turns out that
> we are not descending into drivers/net/dsa/ unconditionally, and we
> won't be able to link-in dsa_loop_bdinfo.o which does the actual mock-up
> mdio device registration.
> 
> Reported-by: Jiri Pirko <jiri@resnulli.us>
> Fixes: 40013ff20b1b ("net: dsa: Fix functional dsa-loop dependency on FIXED_PHY")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com>
Jiri Pirko May 14, 2019, 4:04 p.m. UTC | #2
Mon, May 13, 2019 at 11:06:24PM CEST, f.fainelli@gmail.com wrote:
>Jiri reported that with a kernel built with CONFIG_FIXED_PHY=y,
>CONFIG_NET_DSA=m and CONFIG_NET_DSA_LOOP=m, we would not get to a
>functional state where the mock-up driver is registered. Turns out that
>we are not descending into drivers/net/dsa/ unconditionally, and we
>won't be able to link-in dsa_loop_bdinfo.o which does the actual mock-up
>mdio device registration.
>
>Reported-by: Jiri Pirko <jiri@resnulli.us>
>Fixes: 40013ff20b1b ("net: dsa: Fix functional dsa-loop dependency on FIXED_PHY")
>Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Tested-by: Jiri Pirko <jiri@resnulli.us>
David Miller May 14, 2019, 10:20 p.m. UTC | #3
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Mon, 13 May 2019 14:06:24 -0700

> Jiri reported that with a kernel built with CONFIG_FIXED_PHY=y,
> CONFIG_NET_DSA=m and CONFIG_NET_DSA_LOOP=m, we would not get to a
> functional state where the mock-up driver is registered. Turns out that
> we are not descending into drivers/net/dsa/ unconditionally, and we
> won't be able to link-in dsa_loop_bdinfo.o which does the actual mock-up
> mdio device registration.
> 
> Reported-by: Jiri Pirko <jiri@resnulli.us>
> Fixes: 40013ff20b1b ("net: dsa: Fix functional dsa-loop dependency on FIXED_PHY")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Applied and queued up for -stable, thanks.
diff mbox series

Patch

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 21cde7e78621..0d3ba056cda3 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -40,7 +40,7 @@  obj-$(CONFIG_ARCNET) += arcnet/
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_CAIF) += caif/
 obj-$(CONFIG_CAN) += can/
-obj-$(CONFIG_NET_DSA) += dsa/
+obj-y += dsa/
 obj-$(CONFIG_ETHERNET) += ethernet/
 obj-$(CONFIG_FDDI) += fddi/
 obj-$(CONFIG_HIPPI) += hippi/