From c88f12bd118de0dbcb471d5720cafecbb597b55a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 15 Nov 2009 23:07:30 +0100 Subject: [PATCH] --- yaml --- r: 171845 b: refs/heads/master c: 599bf6a4d64d8399e99514e0e1ef02e97e43238f h: refs/heads/master i: 171843: 94c3a3f8419a8e5f0036fa2476c9350e35b58057 v: v3 --- [refs] | 2 +- trunk/include/net/mac80211.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f626704cf80a..060ec12e5350 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e5b1101f59fb3e17a8eb32cca100ae07fd7100e +refs/heads/master: 599bf6a4d64d8399e99514e0e1ef02e97e43238f diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h index 2c10eac637d8..3b3defbe6fc1 100644 --- a/trunk/include/net/mac80211.h +++ b/trunk/include/net/mac80211.h @@ -390,10 +390,12 @@ struct ieee80211_tx_rate { * @control: union for control data * @status: union for status data * @driver_data: array of driver_data pointers - * @ampdu_ack_len: number of aggregated frames. + * @ampdu_ack_len: number of acked aggregated frames. * relevant only if IEEE80211_TX_STATUS_AMPDU was set. * @ampdu_ack_map: block ack bit map for the aggregation. * relevant only if IEEE80211_TX_STATUS_AMPDU was set. + * @ampdu_len: number of aggregated frames. + * relevant only if IEEE80211_TX_STATUS_AMPDU was set. * @ack_signal: signal strength of the ACK frame */ struct ieee80211_tx_info { @@ -428,7 +430,8 @@ struct ieee80211_tx_info { u8 ampdu_ack_len; u64 ampdu_ack_map; int ack_signal; - /* 8 bytes free */ + u8 ampdu_len; + /* 7 bytes free */ } status; struct { struct ieee80211_tx_rate driver_rates[