aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54
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/p54
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/p54')
-rw-r--r--drivers/net/wireless/p54/txrx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index 82a1cac920bd..f38786e02623 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -422,11 +422,11 @@ static void p54_rx_frame_sent(struct p54_common *priv, struct sk_buff *skb)
422 * Clear manually, ieee80211_tx_info_clear_status would 422 * Clear manually, ieee80211_tx_info_clear_status would
423 * clear the counts too and we need them. 423 * clear the counts too and we need them.
424 */ 424 */
425 memset(&info->status.ampdu_ack_len, 0, 425 memset(&info->status.ack_signal, 0,
426 sizeof(struct ieee80211_tx_info) - 426 sizeof(struct ieee80211_tx_info) -
427 offsetof(struct ieee80211_tx_info, status.ampdu_ack_len)); 427 offsetof(struct ieee80211_tx_info, status.ack_signal));
428 BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, 428 BUILD_BUG_ON(offsetof(struct ieee80211_tx_info,
429 status.ampdu_ack_len) != 23); 429 status.ack_signal) != 20);
430 430
431 if (entry_hdr->flags & cpu_to_le16(P54_HDR_FLAG_DATA_ALIGN)) 431 if (entry_hdr->flags & cpu_to_le16(P54_HDR_FLAG_DATA_ALIGN))
432 pad = entry_data->align[0]; 432 pad = entry_data->align[0];