From 8f036d81e63e40de16e72598744e9518dd84b22c Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 26 May 2010 17:19:25 +0200 Subject: [PATCH] --- yaml --- r: 202815 b: refs/heads/master c: 095dfdb0c479661f437b24b85e31f0d0b841eab6 h: refs/heads/master i: 202813: 2055dbe222f6675c2e4ea10f8c4bdd0990c21371 202811: 7da2321fa83ed19ffcdcd00998c8accaa1ec67ea 202807: 215920a62f4a7eae7a617b3feffadba762f0c035 202799: ce96086ca70568cd64049bbc7acea8c6a0f63e17 202783: 975409c7928b080531048b914fe25ef2fbdf12d4 202751: 09c99c4de5de2d56b5401c971b172d8f1a869e79 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 1 - trunk/include/net/mac80211.h | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7c1006fe0dd2..79c5b83c3344 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a4d4aa2d38e5305b5e93dffdc9dd2f975129328 +refs/heads/master: 095dfdb0c479661f437b24b85e31f0d0b841eab6 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c index 52bec1040467..bde342b5df85 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c @@ -1252,7 +1252,6 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv, info->flags |= IEEE80211_TX_STAT_ACK; info->flags |= IEEE80211_TX_STAT_AMPDU; info->status.ampdu_ack_len = successes; - info->status.ampdu_ack_map = bitmap; info->status.ampdu_len = agg->frame_count; iwlagn_hwrate_to_tx_control(priv, agg->rate_n_flags, info); diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h index de22cbfef232..f26440a46df0 100644 --- a/trunk/include/net/mac80211.h +++ b/trunk/include/net/mac80211.h @@ -412,8 +412,6 @@ struct ieee80211_tx_rate { * @driver_data: array of driver_data pointers * @ampdu_ack_len: number of acked aggregated frames. * relevant only if IEEE80211_TX_STAT_AMPDU was set. - * @ampdu_ack_map: block ack bit map for the aggregation. - * relevant only if IEEE80211_TX_STAT_AMPDU was set. * @ampdu_len: number of aggregated frames. * relevant only if IEEE80211_TX_STAT_AMPDU was set. * @ack_signal: signal strength of the ACK frame @@ -448,10 +446,9 @@ struct ieee80211_tx_info { struct { struct ieee80211_tx_rate rates[IEEE80211_TX_MAX_RATES]; u8 ampdu_ack_len; - u64 ampdu_ack_map; int ack_signal; u8 ampdu_len; - /* 7 bytes free */ + /* 15 bytes free */ } status; struct { struct ieee80211_tx_rate driver_rates[