diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2010-05-26 11:19:25 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-03 14:10:44 -0400 |
commit | 095dfdb0c479661f437b24b85e31f0d0b841eab6 (patch) | |
tree | 26a7e5f07c7545f179a501f55353560fe540e544 | |
parent | 3a4d4aa2d38e5305b5e93dffdc9dd2f975129328 (diff) |
mac80211: remove tx status ampdu_ack_map
There's a single use of this struct member, but
as it is write-only it clearly not necessary.
Thus we can free up some space here, even if we
don't need it right now it seems pointless to
carry around the variable.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 1 | ||||
-rw-r--r-- | include/net/mac80211.h | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c index 52bec1040467..bde342b5df85 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c | |||
@@ -1252,7 +1252,6 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv, | |||
1252 | info->flags |= IEEE80211_TX_STAT_ACK; | 1252 | info->flags |= IEEE80211_TX_STAT_ACK; |
1253 | info->flags |= IEEE80211_TX_STAT_AMPDU; | 1253 | info->flags |= IEEE80211_TX_STAT_AMPDU; |
1254 | info->status.ampdu_ack_len = successes; | 1254 | info->status.ampdu_ack_len = successes; |
1255 | info->status.ampdu_ack_map = bitmap; | ||
1256 | info->status.ampdu_len = agg->frame_count; | 1255 | info->status.ampdu_len = agg->frame_count; |
1257 | iwlagn_hwrate_to_tx_control(priv, agg->rate_n_flags, info); | 1256 | iwlagn_hwrate_to_tx_control(priv, agg->rate_n_flags, info); |
1258 | 1257 | ||
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index de22cbfef232..f26440a46df0 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -412,8 +412,6 @@ struct ieee80211_tx_rate { | |||
412 | * @driver_data: array of driver_data pointers | 412 | * @driver_data: array of driver_data pointers |
413 | * @ampdu_ack_len: number of acked aggregated frames. | 413 | * @ampdu_ack_len: number of acked aggregated frames. |
414 | * relevant only if IEEE80211_TX_STAT_AMPDU was set. | 414 | * relevant only if IEEE80211_TX_STAT_AMPDU was set. |
415 | * @ampdu_ack_map: block ack bit map for the aggregation. | ||
416 | * relevant only if IEEE80211_TX_STAT_AMPDU was set. | ||
417 | * @ampdu_len: number of aggregated frames. | 415 | * @ampdu_len: number of aggregated frames. |
418 | * relevant only if IEEE80211_TX_STAT_AMPDU was set. | 416 | * relevant only if IEEE80211_TX_STAT_AMPDU was set. |
419 | * @ack_signal: signal strength of the ACK frame | 417 | * @ack_signal: signal strength of the ACK frame |
@@ -448,10 +446,9 @@ struct ieee80211_tx_info { | |||
448 | struct { | 446 | struct { |
449 | struct ieee80211_tx_rate rates[IEEE80211_TX_MAX_RATES]; | 447 | struct ieee80211_tx_rate rates[IEEE80211_TX_MAX_RATES]; |
450 | u8 ampdu_ack_len; | 448 | u8 ampdu_ack_len; |
451 | u64 ampdu_ack_map; | ||
452 | int ack_signal; | 449 | int ack_signal; |
453 | u8 ampdu_len; | 450 | u8 ampdu_len; |
454 | /* 7 bytes free */ | 451 | /* 15 bytes free */ |
455 | } status; | 452 | } status; |
456 | struct { | 453 | struct { |
457 | struct ieee80211_tx_rate driver_rates[ | 454 | struct ieee80211_tx_rate driver_rates[ |