kernel: bump 5.15 to 5.15.108

[openwrt/staging/dedeckeh.git] / target / linux / generic / backport-5.15 / 785-v6.1-net-sfp-move-Alcatel-Lucent-3FE46541AA-fixup.patch

diff --git a/target/linux/generic/backport-5.15/785-v6.1-net-sfp-move-Alcatel-Lucent-3FE46541AA-fixup.patch b/target/linux/generic/backport-5.15/785-v6.1-net-sfp-move-Alcatel-Lucent-3FE46541AA-fixup.patch
index aa3112e585721864b1cd75e8af12f93822c08560..b076676cff6de71c41899cc661b2ef06441ffaf6 100644 (file)
--- a/target/linux/generic/backport-5.15/785-v6.1-net-sfp-move-Alcatel-Lucent-3FE46541AA-fixup.patch
+++ b/target/linux/generic/backport-5.15/785-v6.1-net-sfp-move-Alcatel-Lucent-3FE46541AA-fixup.patch
@@ -15,7 +15,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/phy/sfp.c
 +++ b/drivers/net/phy/sfp.c
-@@ -311,6 +311,11 @@ static const struct of_device_id sfp_of_
+@@ -317,6 +317,11 @@ static const struct of_device_id sfp_of_
  };
  MODULE_DEVICE_TABLE(of, sfp_of_match);
  
@@ -27,7 +27,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  static void sfp_quirk_2500basex(const struct sfp_eeprom_id *id,
                                unsigned long *modes)
  {
-@@ -341,6 +346,7 @@ static const struct sfp_quirk sfp_quirks
+@@ -347,6 +352,7 @@ static const struct sfp_quirk sfp_quirks
                .vendor = "ALCATELLUCENT",
                .part = "3FE46541AA",
                .modes = sfp_quirk_2500basex,
@@ -35,7 +35,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        }, {
                // Huawei MA5671A can operate at 2500base-X, but report 1.2GBd
                // NRZ in their EEPROM
-@@ -2041,11 +2047,7 @@ static int sfp_sm_mod_probe(struct sfp *
+@@ -2043,11 +2049,7 @@ static int sfp_sm_mod_probe(struct sfp *
        if (sfp->gpio[GPIO_LOS])
                sfp->state_hw_mask |= SFP_F_LOS;
  
@@ -48,7 +48,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        if (!memcmp(id.base.vendor_name, "HUAWEI          ", 16) &&
            !memcmp(id.base.vendor_pn, "MA5671A         ", 16))
-@@ -2054,6 +2056,8 @@ static int sfp_sm_mod_probe(struct sfp *
+@@ -2056,6 +2058,8 @@ static int sfp_sm_mod_probe(struct sfp *
                sfp->tx_fault_ignore = false;
  
        sfp->quirk = sfp_lookup_quirk(&id);