aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/carl9170
diff options
context:
space:
mode:
authorThomas Huehn <thomas@net.t-labs.tu-berlin.de>2012-07-02 13:46:16 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-07-03 07:48:37 -0400
commite3e1a0bcb3f192fe2f95f86a74bd4e7967341e74 (patch)
treeed07b2c0a4bd814263bc1b85183ed0d1040ba274 /drivers/net/wireless/ath/carl9170
parentcb831b537d50d21f6afb5dffbde4cf6523627461 (diff)
mac80211: reduce IEEE80211_TX_MAX_RATES
IEEE80211_TX_MAX_RATES can be reduced from 5 to 4 as there is no current hardware supporting a rate chain with 5 multi rate stages (mrr), so 4 mrr stages are sufficient. The memory that is freed within the ieee80211_tx_info struct will be used in the upcoming Transmission Power Control (TPC) implementation. Suggested-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Thomas Huehn <thomas@net.t-labs.tu-berlin.de> [reword commit message] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/ath/carl9170')
-rw-r--r--drivers/net/wireless/ath/carl9170/tx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index aed305177af6..ede0b572cebc 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -277,11 +277,11 @@ static void carl9170_tx_release(struct kref *ref)
277 return; 277 return;
278 278
279 BUILD_BUG_ON( 279 BUILD_BUG_ON(
280 offsetof(struct ieee80211_tx_info, status.ampdu_ack_len) != 23); 280 offsetof(struct ieee80211_tx_info, status.ack_signal) != 20);
281 281
282 memset(&txinfo->status.ampdu_ack_len, 0, 282 memset(&txinfo->status.ack_signal, 0,
283 sizeof(struct ieee80211_tx_info) - 283 sizeof(struct ieee80211_tx_info) -
284 offsetof(struct ieee80211_tx_info, status.ampdu_ack_len)); 284 offsetof(struct ieee80211_tx_info, status.ack_signal));
285 285
286 if (atomic_read(&ar->tx_total_queued)) 286 if (atomic_read(&ar->tx_total_queued))
287 ar->tx_schedule = true; 287 ar->tx_schedule = true;