32 lines
1005 B
Diff
32 lines
1005 B
Diff
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>
|
|
---
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -949,8 +949,8 @@ void phylink_start(struct phylink *pl)
|
|
|
|
if (pl->link_an_mode == MLO_AN_FIXED && !IS_ERR(pl->link_gpio))
|
|
mod_timer(&pl->link_poll, jiffies + HZ);
|
|
- 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);
|
|
}
|
|
@@ -971,8 +971,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);
|
|
if (pl->link_an_mode == MLO_AN_FIXED && !IS_ERR(pl->link_gpio))
|
|
del_timer_sync(&pl->link_poll);
|
|
|