kernel: bump 4.14 to 4.14.104

[openwrt/staging/wigyori.git] / target / linux / mvebu / patches-4.14 / 409-sfp-use-netdev-sfp_bus-for-start-stop.patch

diff --git a/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch b/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch
index d0b4480f381383717f95451815b28e1a04233185..c2cf554281df65129d66de1f0838ce41b8ebad4c 100644 (file)
--- a/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch
+++ b/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch
@@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -757,8 +757,8 @@ void phylink_start(struct phylink *pl)
+@@ -771,8 +771,8 @@ void phylink_start(struct phylink *pl)
        clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
        phylink_run_resolve(pl);
  
@@ -21,7 +21,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
        if (pl->phydev)
                phy_start(pl->phydev);
  }
-@@ -770,8 +770,8 @@ void phylink_stop(struct phylink *pl)
+@@ -784,8 +784,8 @@ void phylink_stop(struct phylink *pl)
  
        if (pl->phydev)
                phy_stop(pl->phydev);
@@ -30,5 +30,5 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 +      if (pl->netdev->sfp_bus)
 +              sfp_upstream_stop(pl->netdev->sfp_bus);
  
-       set_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
-       queue_work(system_power_efficient_wq, &pl->resolve);
+       phylink_run_resolve_and_disable(pl, PHYLINK_DISABLE_STOPPED);
+ }