Skip to content

Commit

Permalink
ath9k: fix regression in sending aggregated packets
Browse files Browse the repository at this point in the history
The recent commit "ath9k: Send legacy rated frames as unaggregated"
introduced a check to ensure that packets with non-MCS rates set in
the rate series will not be aggregated. However, it failed to check
if the rate series is valid before testing the flags, thus breaking
aggregation for normal MCS-only packets if the last series is unset.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Felix Fietkau authored and John W. Linville committed Aug 29, 2011
1 parent a7be039 commit 059ee09
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/net/wireless/ath/ath9k/xmit.c
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,10 @@ static bool ath_lookup_legacy(struct ath_buf *bf)
tx_info = IEEE80211_SKB_CB(skb);
rates = tx_info->control.rates;

for (i = 3; i >= 0; i--) {
for (i = 0; i < 4; i++) {
if (!rates[i].count || rates[i].idx < 0)
break;

if (!(rates[i].flags & IEEE80211_TX_RC_MCS))
return true;
}
Expand Down

0 comments on commit 059ee09

Please sign in to comment.