diff options
| author | Scott Roberts <ttocsr@gmail.com> | 2020-01-23 21:45:53 -0700 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-01-26 19:20:00 +0100 |
| commit | a461f984c450a49bce1cac191620a8ee2a3329c0 (patch) | |
| tree | 50f676499980f8baab2f97a67918ea8f60b07e72 /target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch | |
| parent | 996f02e5bafad2815e72821c19d41fb5297e4dad (diff) | |
| download | upstream-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/758-net-sfp-error-handling-for-phy-probe.patch')
| -rw-r--r-- | target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch b/target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch index 00896dfa26..8191e622a1 100644 --- a/target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch +++ b/target/linux/generic/pending-4.19/758-net-sfp-error-handling-for-phy-probe.patch @@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -1334,7 +1334,7 @@ static void sfp_sm_phy_detach(struct sfp +@@ -1345,7 +1345,7 @@ static void sfp_sm_phy_detach(struct sfp sfp->mod_phy = NULL; } @@ -19,7 +19,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> { struct phy_device *phy; int err; -@@ -1342,18 +1342,18 @@ static void sfp_sm_probe_phy(struct sfp +@@ -1353,18 +1353,18 @@ static void sfp_sm_probe_phy(struct sfp phy = get_phy_device(sfp->i2c_mii, SFP_PHY_ADDR, is_c45); if (phy == ERR_PTR(-ENODEV)) { dev_info(sfp->dev, "no PHY detected\n"); @@ -41,7 +41,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> } err = sfp_add_phy(sfp->sfp_bus, phy); -@@ -1361,10 +1361,12 @@ static void sfp_sm_probe_phy(struct sfp +@@ -1372,10 +1372,12 @@ static void sfp_sm_probe_phy(struct sfp phy_device_remove(phy); phy_device_free(phy); dev_err(sfp->dev, "sfp_add_phy failed: %d\n", err); @@ -55,7 +55,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> } static void sfp_sm_link_up(struct sfp *sfp) -@@ -1437,21 +1439,24 @@ static void sfp_sm_fault(struct sfp *sfp +@@ -1448,21 +1450,24 @@ static void sfp_sm_fault(struct sfp *sfp * Clause 45 copper SFP+ modules (10G) appear to switch their interface * mode according to the negotiated line speed. */ @@ -83,7 +83,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> } static int sfp_module_parse_power(struct sfp *sfp) -@@ -1855,7 +1860,10 @@ static void sfp_sm_main(struct sfp *sfp, +@@ -1873,7 +1878,10 @@ static void sfp_sm_main(struct sfp *sfp, init_done: /* TX_FAULT deasserted or we timed out with TX_FAULT * clear. Probe for the PHY and check the LOS state. */ |