ath5k: fix regression in tx status processing
PATCH 1/1 ath5k: fix regression in tx status processing
The regression was introduced in the following commit:
0967e01e8e713ed2982fb4eba8ba13794e9a6e89
"ath5k: make use of the new rate control API"
ath5k_tx_frame_completed saves the intended per-rate retry counts before they are cleared by ieee80211_tx_info_clear_status, however at this point the information in info->status.rates is incomplete.
This causes significant throughput degradation and excessive packet loss on links where high bit rates don't work properly.
Move the copy from bf->rates a few lines up to ensure that the saved retry counts are updated, and that they are really cleared in info->status.rates after the call to ieee80211_tx_info_clear_status.
--- drivers/net/wireless/ath/ath5k/base.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +3 -3
@@ -1663,15 +1663,15 @@ ath5k_tx_frame_completed(struct ath5k_hw *ah, struct sk_buff *skb, ah->stats.tx_bytes_count += skb->len; info =IEEE80211_SKB_CB (skb); + size =min_t (int,sizeof (info->status.rates),sizeof (bf->rates)); +memcpy (info->status.rates, bf->rates, size); + tries[0 ] = info->status.rates[0 ].count; tries[1 ] = info->status.rates[1 ].count; tries[2 ] = info->status.rates[2 ].count;ieee80211_tx_info_clear_status (info); - size =min_t (int,sizeof (info->status.rates),sizeof (bf->rates)); -memcpy (info->status.rates, bf->rates, size); -for (i =0 ; i < ts->ts_final_idx; i++) {struct ieee80211_tx_rate *r = &info->status.rates[i];
Signature · 1 line
1.8.0.2
Quoted 16 lines · Felix Fietkau
The regression was introduced in the following commit:
0967e01e8e713ed2982fb4eba8ba13794e9a6e89
"ath5k: make use of the new rate control API"
ath5k_tx_frame_completedsaves the intended per-rate retry counts before they are cleared byieee80211_tx_info_clear_status, however at this point the information ininfo->status.ratesis incomplete.This causes significant throughput degradation and excessive packet loss on links where high bit rates don't work properly.
Move the copy from
bf->ratesa few lines up to ensure that the saved retry counts are updated, and that they are really cleared ininfo->status.ratesafter the call toieee80211_tx_info_clear_status.
Quoted 5 lines
Cc [email protected] # 3.10+Cc Thomas Huehn <[email protected]>Cc Benjamin Vahl <[email protected]>Reported-by Ben West <[email protected]>Signed-off-by Felix Fietkau <[email protected]>
Good catch !
Quoted 34 lines
---
drivers/net/wireless/ath/ath5k/base.c| 6 +++---1 file changed, 3 insertions(+), 3 deletions(-)drivers/net/wireless/ath/ath5k/base.c +3
-3@@ -1663,15 +1663,15 @@ ath5k_tx_frame_completed(struct ath5k_hw *ah, struct sk_buff *skb, ah->stats.tx_bytes_count += skb->len; info =IEEE80211_SKB_CB (skb); + size =min_t (int,sizeof (info->status.rates),sizeof (bf->rates)); +memcpy (info->status.rates, bf->rates, size); + tries[0 ] = info->status.rates[0 ].count; tries[1 ] = info->status.rates[1 ].count; tries[2 ] = info->status.rates[2 ].count;ieee80211_tx_info_clear_status (info); - size =min_t (int,sizeof (info->status.rates),sizeof (bf->rates)); -memcpy (info->status.rates, bf->rates, size); -for (i =0 ; i < ts->ts_final_idx; i++) {struct ieee80211_tx_rate *r = &info->status.rates[i];Signature · 6 lines
1.8.0.2 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html