[PATCH 1/3] mac80211: minstrel_ht A-MPDU fix

[PATCH 1/3] mac80211: minstrel_ht A-MPDU fix

[Björn Smedman]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1941 bytes --]

This patch fixes two problems with the minstrel_ht rate control
algorithms handling of A-MPDU frames:

1. The ampdu_len field of the tx status is not always initialized for 
non-HT frames (and it would probably be unreasonable to require all 
drivers to do so). This could cause rate control statistics to be 
corrupted. We now trust the ampdu_len and ampdu_ack_len fields only when 
the frame is marked with the IEEE80211_TX_STAT_AMPDU flag.

2. Successful transmission attempts where only recognized when the A-MPDU
subframe carrying the rate control status information was marked with the
IEEE80211_TX_STAT_ACK flag. If this information happed to be carried on a
frame that failed to be ACKed then the other subframes (which may have
succeeded) where not correctly registered. We now update rate control
statistics regardless of whether the subframe carrying the information was
ACKed or not.

Cc: <stable@kernel.org>
Signed-off-by: Björn Smedman <bjorn.smedman@venatech.se>
---
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index c5b4659..2a18d66 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -397,8 +397,9 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
 	    !(info->flags & IEEE80211_TX_STAT_AMPDU))
 		return;
 
-	if (!info->status.ampdu_len) {
-		info->status.ampdu_ack_len = 1;
+	if (!(info->flags & IEEE80211_TX_STAT_AMPDU)) {
+		info->status.ampdu_ack_len =
+			(info->flags & IEEE80211_TX_STAT_ACK ? 1 : 0);
 		info->status.ampdu_len = 1;
 	}
 
@@ -426,7 +427,7 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
 		group = minstrel_ht_get_group_idx(&ar[i]);
 		rate = &mi->groups[group].rates[ar[i].idx % 8];
 
-		if (last && (info->flags & IEEE80211_TX_STAT_ACK))
+		if (last)
 			rate->success += info->status.ampdu_ack_len;
 
 		rate->attempts += ar[i].count * info->status.ampdu_len;

Re: [PATCH 1/3] mac80211: minstrel_ht A-MPDU fix

[Felix Fietkau]

On 2010-10-10 10:14 PM, Björn Smedman wrote:
> This patch fixes two problems with the minstrel_ht rate control
> algorithms handling of A-MPDU frames:
> 
> 1. The ampdu_len field of the tx status is not always initialized for 
> non-HT frames (and it would probably be unreasonable to require all 
> drivers to do so). This could cause rate control statistics to be 
> corrupted. We now trust the ampdu_len and ampdu_ack_len fields only when 
> the frame is marked with the IEEE80211_TX_STAT_AMPDU flag.
> 
> 2. Successful transmission attempts where only recognized when the A-MPDU
> subframe carrying the rate control status information was marked with the
> IEEE80211_TX_STAT_ACK flag. If this information happed to be carried on a
> frame that failed to be ACKed then the other subframes (which may have
> succeeded) where not correctly registered. We now update rate control
> statistics regardless of whether the subframe carrying the information was
> ACKed or not.
> 
> Cc: <stable@kernel.org>
> Signed-off-by: Björn Smedman <bjorn.smedman@venatech.se>
For all 3 patches:
Acked-by: Felix Fietkau <nbd@openwrt.org>