diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-27 17:07:48 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-03-05 13:19:43 +0100 |
| commit | 1cfbf95393decf047900e1b66b076a030704db20 (patch) | |
| tree | 8087326ea9c0d8885763999944c258fdd5b742f4 /target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch | |
| parent | fc45ae44613b41f7328e81d0999f609dd7e81482 (diff) | |
| download | upstream-1cfbf95393decf047900e1b66b076a030704db20.tar.gz upstream-1cfbf95393decf047900e1b66b076a030704db20.tar.bz2 upstream-1cfbf95393decf047900e1b66b076a030704db20.zip | |
kernel: bump 4.14 to 4.14.104
Refreshed all patches.
Altered patches:
- 332-arc-add-OWRTDTB-section.patch
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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); + } |