From 7e1cc9438d8d60a7af9c65411a6ec3622f2b9990 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 9 Jan 2009 15:25:09 -0800 Subject: [PATCH] --- yaml --- r: 130146 b: refs/heads/master c: b6b50a21625bbf59a89b807dd0fc1eb5412aeff3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/mac80211.h | 1 - trunk/net/mac80211/sta_info.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c4b659794d54..7a721b7262bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef15aa490f2e447ce04fe643500b814ef40f6ea9 +refs/heads/master: b6b50a21625bbf59a89b807dd0fc1eb5412aeff3 diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h index b3bd00a9d992..559422fc0943 100644 --- a/trunk/include/net/mac80211.h +++ b/trunk/include/net/mac80211.h @@ -322,7 +322,6 @@ struct ieee80211_tx_rate { * @control: union for control data * @status: union for status data * @driver_data: array of driver_data pointers - * @retry_count: number of retries * @ampdu_ack_len: number of aggregated frames. * relevant only if IEEE80211_TX_STATUS_AMPDU was set. * @ampdu_ack_map: block ack bit map for the aggregation. diff --git a/trunk/net/mac80211/sta_info.h b/trunk/net/mac80211/sta_info.h index dc2606d0ae77..e49a5b99cf10 100644 --- a/trunk/net/mac80211/sta_info.h +++ b/trunk/net/mac80211/sta_info.h @@ -195,7 +195,6 @@ struct sta_ampdu_mlme { * @tx_packets: number of RX/TX MSDUs * @tx_bytes: number of bytes transmitted to this STA * @tx_fragments: number of transmitted MPDUs - * @last_txrate: description of the last used transmit rate * @tid_seq: per-TID sequence numbers for sending to this STA * @ampdu_mlme: A-MPDU state machine state * @timer_to_tid: identity mapping to ID timers