diff options
author | Felix Fietkau <nbd@openwrt.org> | 2010-03-01 21:48:55 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2010-03-01 21:48:55 +0000 |
commit | cbd858715da1a766154d8125373d7e2dc5d4eb95 (patch) | |
tree | ba2361f70898e52b06bc89f5b66570264609abb7 /package/mac80211/patches/560-ath9k_fix_ampdu_rate_handling.patch | |
parent | 6a11bbbac947fc2f1b29280b824dc21b0ae8d85c (diff) | |
download | upstream-cbd858715da1a766154d8125373d7e2dc5d4eb95.tar.gz upstream-cbd858715da1a766154d8125373d7e2dc5d4eb95.tar.bz2 upstream-cbd858715da1a766154d8125373d7e2dc5d4eb95.zip |
mac80211: add the new 802.11n minstrel rate control implementation (optional, not used by default)
SVN-Revision: 19943
Diffstat (limited to 'package/mac80211/patches/560-ath9k_fix_ampdu_rate_handling.patch')
-rw-r--r-- | package/mac80211/patches/560-ath9k_fix_ampdu_rate_handling.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/package/mac80211/patches/560-ath9k_fix_ampdu_rate_handling.patch b/package/mac80211/patches/560-ath9k_fix_ampdu_rate_handling.patch new file mode 100644 index 0000000000..4e1d599726 --- /dev/null +++ b/package/mac80211/patches/560-ath9k_fix_ampdu_rate_handling.patch @@ -0,0 +1,42 @@ +--- a/drivers/net/wireless/ath/ath9k/xmit.c ++++ b/drivers/net/wireless/ath/ath9k/xmit.c +@@ -1947,10 +1947,10 @@ static void ath_tx_rc_status(struct ath_ + tx_rateindex = ds->ds_txstat.ts_rateindex; + WARN_ON(tx_rateindex >= hw->max_rates); + +- if (update_rc) +- tx_info->pad[0] |= ATH_TX_INFO_UPDATE_RC; + if (ds->ds_txstat.ts_status & ATH9K_TXERR_FILT) + tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED; ++ if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && update_rc) ++ tx_info->flags |= IEEE80211_TX_STAT_AMPDU; + + if ((ds->ds_txstat.ts_status & ATH9K_TXERR_FILT) == 0 && + (bf->bf_flags & ATH9K_TXDESC_NOACK) == 0 && update_rc) { +--- a/drivers/net/wireless/ath/ath9k/rc.h ++++ b/drivers/net/wireless/ath/ath9k/rc.h +@@ -172,7 +172,6 @@ struct ath_rate_priv { + + #define ATH_TX_INFO_FRAME_TYPE_INTERNAL (1 << 0) + #define ATH_TX_INFO_FRAME_TYPE_PAUSE (1 << 1) +-#define ATH_TX_INFO_UPDATE_RC (1 << 2) + #define ATH_TX_INFO_XRETRY (1 << 3) + #define ATH_TX_INFO_UNDERRUN (1 << 4) + +--- a/drivers/net/wireless/ath/ath9k/rc.c ++++ b/drivers/net/wireless/ath/ath9k/rc.c +@@ -1226,8 +1226,12 @@ static void ath_tx_status(void *priv, st + long_retry = rate->count - 1; + } + +- if (!priv_sta || !ieee80211_is_data(fc) || +- !(tx_info->pad[0] & ATH_TX_INFO_UPDATE_RC)) ++ if (!priv_sta || !ieee80211_is_data(fc)) ++ return; ++ ++ /* This packet was aggregated but doesn't carry status info */ ++ if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && ++ !(tx_info->flags & IEEE80211_TX_STAT_AMPDU)) + return; + + if (tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED) |