On Sat, Apr 02, 2022 at 03:14:53PM +0200, Toke Høiland-Jørgensen wrote: > Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> writes: > > > On Sat, Apr 02, 2022 at 02:27:51PM +0200, Toke Høiland-Jørgensen wrote: > >> From: Toke Høiland-Jørgensen <toke@xxxxxxxxxx> > >> > >> The ieee80211_tx_info_clear_status() helper also clears the rate counts, so > >> we should restore them after clearing. However, we can get rid of the > >> existing clearing of the counts of invalid rates. Rearrange the code a bit > >> so the order fits the indexes, and so the setting of the count to > >> hw->max_rate_tries on underrun is not immediately overridden. > >> > >> Cc: stable@xxxxxxxxxxxxxxx > >> Reported-by: Peter Seiderer <ps.report@xxxxxxx> > >> Fixes: 037250f0a45c ("ath9k: Properly clear TX status area before reporting to mac80211") > >> Signed-off-by: Toke Høiland-Jørgensen <toke@xxxxxxxxxx> > >> --- > >> drivers/net/wireless/ath/ath9k/xmit.c | 25 +++++++++++++++---------- > >> 1 file changed, 15 insertions(+), 10 deletions(-) > > > > What is the git commit id of this change in Linus's tree? > > You mean the commit referred to in the Fixes: tag, right? That's not in > Linus' tree yet, it's a follow-up to a commit that was merged into the > wireless tree yesterday and marked for stable, so the two commits should > be added to stable together once they do hit Linus' tree. > > I forgot to add the stable Cc when sending out the previous patch, so > Kalle added it when committing; so I guess you haven't seen that one? :) Ah, sorry, I thought this was a request to add a specific patch to the stable tree. Nevermind, sorry for the noise. greg k-h