diff options
| author | Björn Smedman | 2010-10-10 22:51:54 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-10-11 21:04:24 +0200 |
| commit | a8909cfb1832ac623142898df2a9374722cfe68f (patch) | |
| tree | e2246e34e5535564a2b51f6ca45392738ece345b | |
| parent | ath9k: A-MPDU rate control info fix (diff) | |
| download | kernel-qcow2-linux-a8909cfb1832ac623142898df2a9374722cfe68f.tar.gz kernel-qcow2-linux-a8909cfb1832ac623142898df2a9374722cfe68f.tar.xz kernel-qcow2-linux-a8909cfb1832ac623142898df2a9374722cfe68f.zip | |
ath9k: built-in rate control A-MPDU fix
This patch attempts to ensure that ath9k's built-in rate control algorithm
does not rely on the value of the ampdu_len and ampdu_ack_len tx status
fields unless the IEEE80211_TX_STAT_AMPDU flag is set.
This patch has not been tested.
Cc: <stable@kernel.org>
Signed-off-by: Björn Smedman <bjorn.smedman@venatech.se>
Acked-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/rc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c index ce1cd6d85847..13f9e88e1187 100644 --- a/drivers/net/wireless/ath/ath9k/rc.c +++ b/drivers/net/wireless/ath/ath9k/rc.c @@ -1375,6 +1375,12 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband, if (tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED) return; + if (!(tx_info->flags & IEEE80211_TX_STAT_AMPDU)) { + tx_info->status.ampdu_ack_len = + (tx_info->flags & IEEE80211_TX_STAT_ACK ? 1 : 0); + tx_info->status.ampdu_len = 1; + } + /* * If an underrun error is seen assume it as an excessive retry only * if max frame trigger level has been reached (2 KB for singel stream, |