lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 285/496] net: dsa: Fix functional dsa-loop dependency on FIXED_PHY
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Florian Fainelli <f.fainelli@gmail.com>

    [ Upstream commit 40013ff20b1beed31184935fc0aea6a859d4d4ef ]

    We have a functional dependency on the FIXED_PHY MDIO bus because we register
    fixed PHY devices "the old way" which only works if the code that does this has
    had a chance to run before the fixed MDIO bus is probed. Make sure we account
    for that and have dsa_loop_bdinfo.o be either built-in or modular depending on
    whether CONFIG_FIXED_PHY reflects that too.

    Fixes: 98cd1552ea27 ("net: dsa: Mock-up driver")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/dsa/Makefile | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/net/dsa/Makefile
    +++ b/drivers/net/dsa/Makefile
    @@ -1,7 +1,10 @@
    # SPDX-License-Identifier: GPL-2.0
    obj-$(CONFIG_NET_DSA_BCM_SF2) += bcm-sf2.o
    bcm-sf2-objs := bcm_sf2.o bcm_sf2_cfp.o
    -obj-$(CONFIG_NET_DSA_LOOP) += dsa_loop.o dsa_loop_bdinfo.o
    +obj-$(CONFIG_NET_DSA_LOOP) += dsa_loop.o
    +ifdef CONFIG_NET_DSA_LOOP
    +obj-$(CONFIG_FIXED_PHY) += dsa_loop_bdinfo.o
    +endif
    obj-$(CONFIG_NET_DSA_MT7530) += mt7530.o
    obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
    obj-$(CONFIG_NET_DSA_QCA8K) += qca8k.o

    \
     
     \ /
      Last update: 2018-05-28 14:53    [W:4.066 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site