diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2022-10-21 23:08:54 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2022-10-24 21:10:46 +0200 |
| commit | d7a6e171c048d07644e3a39e8cefabeb0be06d8d (patch) | |
| tree | d9141541c58528874091feb9b3200a6cccafee61 /target/linux/generic/hack-5.15/790-SFP-GE-T-ignore-TX_FAULT.patch | |
| parent | 90629d82daa467c03626b8abc4671046dc548118 (diff) | |
| download | upstream-d7a6e171c048d07644e3a39e8cefabeb0be06d8d.tar.gz upstream-d7a6e171c048d07644e3a39e8cefabeb0be06d8d.tar.bz2 upstream-d7a6e171c048d07644e3a39e8cefabeb0be06d8d.zip | |
generic: 5.15: move sfp HALNy patch from pending to backport
Move sfp HALNy patch from pending to backport as they got merged
upstream. The patch was reordered and one was squashed in the upstream
variant.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/hack-5.15/790-SFP-GE-T-ignore-TX_FAULT.patch')
| -rw-r--r-- | target/linux/generic/hack-5.15/790-SFP-GE-T-ignore-TX_FAULT.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/hack-5.15/790-SFP-GE-T-ignore-TX_FAULT.patch b/target/linux/generic/hack-5.15/790-SFP-GE-T-ignore-TX_FAULT.patch index d9835f8896..83b2c304e2 100644 --- a/target/linux/generic/hack-5.15/790-SFP-GE-T-ignore-TX_FAULT.patch +++ b/target/linux/generic/hack-5.15/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 -@@ -369,6 +369,11 @@ static const struct sfp_quirk sfp_quirks +@@ -373,6 +373,11 @@ static const struct sfp_quirk sfp_quirks .modes = sfp_quirk_2500basex, .fixup = sfp_fixup_ignore_tx_fault, }, { @@ -38,7 +38,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 .vendor = "Lantech", -@@ -2303,7 +2308,8 @@ static void sfp_sm_main(struct sfp *sfp, +@@ -2306,7 +2311,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, @@ -48,7 +48,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> } else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { init_done: sfp->sm_phy_retries = R_PHY_RETRY; -@@ -2526,10 +2532,12 @@ static void sfp_check_state(struct sfp * +@@ -2529,10 +2535,12 @@ static void sfp_check_state(struct sfp * mutex_lock(&sfp->st_mutex); state = sfp_get_state(sfp); changed = state ^ sfp->state; |