aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.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/743-net-sfp-add-module-start-stop-upstream-notifications.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/743-net-sfp-add-module-start-stop-upstream-notifications.patch')
-rw-r--r--target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch b/target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch
index e0eea5e605..c0c3e9e57e 100644
--- a/target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch
+++ b/target/linux/generic/pending-4.19/743-net-sfp-add-module-start-stop-upstream-notifications.patch
@@ -78,7 +78,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
[SFP_S_WAIT] = "wait",
[SFP_S_INIT] = "init",
[SFP_S_INIT_TX_FAULT] = "init_tx_fault",
-@@ -1749,6 +1751,8 @@ static void sfp_sm_main(struct sfp *sfp,
+@@ -1766,6 +1768,8 @@ static void sfp_sm_main(struct sfp *sfp,
if (sfp->sm_state == SFP_S_LINK_UP &&
sfp->sm_dev_state == SFP_DEV_UP)
sfp_sm_link_down(sfp);
@@ -87,7 +87,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (sfp->mod_phy)
sfp_sm_phy_detach(sfp);
sfp_module_tx_disable(sfp);
-@@ -1815,6 +1819,10 @@ static void sfp_sm_main(struct sfp *sfp,
+@@ -1833,6 +1837,10 @@ static void sfp_sm_main(struct sfp *sfp,
* clear. Probe for the PHY and check the LOS state.
*/
sfp_sm_probe_for_phy(sfp);