150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
35 lines
1.1 KiB
Plaintext
35 lines
1.1 KiB
Plaintext
From 883dc66755313e133a787eba4dfde313fe33525b Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Date: Fri, 14 Apr 2017 16:41:55 +0100
|
|
Subject: sfp: use netdev sfp_bus for start/stop
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/net/phy/phylink.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -755,8 +755,8 @@ void phylink_start(struct phylink *pl)
|
|
clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
|
|
phylink_run_resolve(pl);
|
|
|
|
- if (pl->sfp_bus)
|
|
- sfp_upstream_start(pl->sfp_bus);
|
|
+ if (pl->netdev->sfp_bus)
|
|
+ sfp_upstream_start(pl->netdev->sfp_bus);
|
|
if (pl->phydev)
|
|
phy_start(pl->phydev);
|
|
}
|
|
@@ -768,8 +768,8 @@ void phylink_stop(struct phylink *pl)
|
|
|
|
if (pl->phydev)
|
|
phy_stop(pl->phydev);
|
|
- if (pl->sfp_bus)
|
|
- sfp_upstream_stop(pl->sfp_bus);
|
|
+ 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);
|