aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch
diff options
context:
space:
mode:
authorScott Roberts <ttocsr@gmail.com>2020-01-23 21:45:53 -0700
committerHauke Mehrtens <hauke@hauke-m.de>2020-01-26 19:20:00 +0100
commita461f984c450a49bce1cac191620a8ee2a3329c0 (patch)
tree50f676499980f8baab2f97a67918ea8f60b07e72 /target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch
parent996f02e5bafad2815e72821c19d41fb5297e4dad (diff)
downloadupstream-a461f984c450a49bce1cac191620a8ee2a3329c0.tar.gz
upstream-a461f984c450a49bce1cac191620a8ee2a3329c0.tar.bz2
upstream-a461f984c450a49bce1cac191620a8ee2a3329c0.zip
kernel: sfp: add Nokia SFP fix from net-next
Add Nokia GPON ONT SFP fix for tx_fault in net-next. Signed-off-by: Scott Roberts <ttocsr@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch')
-rw-r--r--target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch b/target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch
index b3c47a054f..a646fcd409 100644
--- a/target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch
+++ b/target/linux/generic/pending-4.19/744-net-sfp-move-phy_start-phy_stop-to-phylink.patch
@@ -54,7 +54,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
.connect_phy = phylink_sfp_connect_phy,
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
-@@ -1320,7 +1320,6 @@ static void sfp_sm_mod_next(struct sfp *
+@@ -1331,7 +1331,6 @@ static void sfp_sm_mod_next(struct sfp *
static void sfp_sm_phy_detach(struct sfp *sfp)
{
@@ -62,7 +62,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
sfp_remove_phy(sfp->sfp_bus);
phy_device_remove(sfp->mod_phy);
phy_device_free(sfp->mod_phy);
-@@ -1351,7 +1350,6 @@ static void sfp_sm_probe_phy(struct sfp
+@@ -1362,7 +1361,6 @@ static void sfp_sm_probe_phy(struct sfp
}
sfp->mod_phy = phy;