kernel: sfp: add Nokia SFP fix from net-next

[openwrt/staging/dedeckeh.git] / target / linux / generic / pending-4.19 / 744-net-sfp-move-phy_start-phy_stop-to-phylink.patch

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 b3c47a054fa9a8a6f944ed8eadda6767122962ed..a646fcd409ea5e1807110d00a9bf9a449dd6d373 100644 (file)
--- 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;