| From foo@baz Wed 22 May 2019 08:37:51 AM CEST |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Mon, 13 May 2019 14:06:24 -0700 |
| Subject: net: Always descend into dsa/ |
| |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| |
| [ Upstream commit 0fe9f173d6cda95874edeb413b1fa9907b5ae830 ] |
| |
| 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> |
| Tested-by: Jiri Pirko <jiri@resnulli.us> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/Makefile | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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/ |
