aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2010-05-26 11:19:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-06-03 14:10:44 -0400
commit095dfdb0c479661f437b24b85e31f0d0b841eab6 (patch)
tree26a7e5f07c7545f179a501f55353560fe540e544 /include/net/mac80211.h
parent3a4d4aa2d38e5305b5e93dffdc9dd2f975129328 (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>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h5
1 files changed, 1 insertions, 4 deletions
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[