aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.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/753-net-sfp-add-support-for-Clause-45-PHYs.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/753-net-sfp-add-support-for-Clause-45-PHYs.patch')
-rw-r--r--target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch b/target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch
index a710901690..ea26770841 100644
--- a/target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch
+++ b/target/linux/generic/pending-4.19/753-net-sfp-add-support-for-Clause-45-PHYs.patch
@@ -14,7 +14,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
-@@ -1326,12 +1326,12 @@ static void sfp_sm_phy_detach(struct sfp
+@@ -1337,12 +1337,12 @@ static void sfp_sm_phy_detach(struct sfp
sfp->mod_phy = NULL;
}
@@ -29,7 +29,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (phy == ERR_PTR(-ENODEV)) {
dev_info(sfp->dev, "no PHY detected\n");
return;
-@@ -1341,6 +1341,13 @@ static void sfp_sm_probe_phy(struct sfp
+@@ -1352,6 +1352,13 @@ static void sfp_sm_probe_phy(struct sfp
return;
}
@@ -43,7 +43,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
err = sfp_add_phy(sfp->sfp_bus, phy);
if (err) {
phy_device_remove(phy);
-@@ -1411,10 +1418,32 @@ static void sfp_sm_fault(struct sfp *sfp
+@@ -1422,10 +1429,32 @@ static void sfp_sm_fault(struct sfp *sfp
}
}
@@ -78,7 +78,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
}
static int sfp_module_parse_power(struct sfp *sfp)
-@@ -1474,6 +1503,13 @@ static int sfp_sm_mod_hpower(struct sfp
+@@ -1485,6 +1514,13 @@ static int sfp_sm_mod_hpower(struct sfp
return -EAGAIN;
}