X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fwigyori.git;a=blobdiff_plain;f=target%2Flinux%2Fmvebu%2Fpatches-4.14%2F409-sfp-use-netdev-sfp_bus-for-start-stop.patch;h=c2cf554281df65129d66de1f0838ce41b8ebad4c;hp=47b71ee4c153d1f8ee19ef854569ea64125ea95a;hb=1cfbf95393decf047900e1b66b076a030704db20;hpb=fc45ae44613b41f7328e81d0999f609dd7e81482

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 47b71ee4c1..c2cf554281 100644
--- 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
-@@ -760,8 +760,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);
  }
-@@ -773,8 +773,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);
+ }