generic: 6.6: refresh hack patches

[openwrt/staging/wigyori.git] / target / linux / generic / hack-6.6 / 790-SFP-GE-T-ignore-TX_FAULT.patch

diff --git a/target/linux/generic/hack-6.6/790-SFP-GE-T-ignore-TX_FAULT.patch b/target/linux/generic/hack-6.6/790-SFP-GE-T-ignore-TX_FAULT.patch
index 8fb8aa84d51ca0b69e26f1ce4249a6fd61576406..d48f382ce5d042090b28c060edf5c45235c50446 100644 (file)
--- a/target/linux/generic/hack-6.6/790-SFP-GE-T-ignore-TX_FAULT.patch
+++ b/target/linux/generic/hack-6.6/790-SFP-GE-T-ignore-TX_FAULT.patch
@@ -26,7 +26,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/net/phy/sfp.c
 +++ b/drivers/net/phy/sfp.c
-@@ -409,6 +409,9 @@ static const struct sfp_quirk sfp_quirks
+@@ -471,6 +471,9 @@ static const struct sfp_quirk sfp_quirks
        // FS 2.5G Base-T
        SFP_QUIRK_M("FS", "SFP-2.5G-T", sfp_quirk_oem_2_5g),
  
@@ -36,7 +36,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        // Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report
        // 2500MBd NRZ in their EEPROM
        SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex),
-@@ -2344,7 +2347,8 @@ static void sfp_sm_main(struct sfp *sfp,
+@@ -2587,7 +2590,8 @@ static void sfp_sm_main(struct sfp *sfp,
                         * or t_start_up, so assume there is a fault.
                         */
                        sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT,
@@ -46,7 +46,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) {
        init_done:
                        /* Create mdiobus and start trying for PHY */
-@@ -2578,10 +2582,12 @@ static void sfp_check_state(struct sfp *
+@@ -2841,10 +2845,12 @@ static void sfp_check_state(struct sfp *
        mutex_lock(&sfp->st_mutex);
        state = sfp_get_state(sfp);
        changed = state ^ sfp->state;