diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-20 17:37:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-20 17:37:10 -0500 |
| commit | 518aa1b5443c8a36300c20a5473df01fb8975dad (patch) | |
| tree | 0fe7200d4061dbfcd9b58b8f5f9264edbd9f7c05 /net/mac80211/sta_info.h | |
| parent | 66f9a2590aa87dc77cddaeaf46177de76edd2339 (diff) | |
| parent | 674743033c1ae9f7cc94e1e0037f6f719e6d1d67 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/sta_info.h')
| -rw-r--r-- | net/mac80211/sta_info.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index dc2606d0ae77..e49a5b99cf10 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
| @@ -195,7 +195,6 @@ struct sta_ampdu_mlme { | |||
| 195 | * @tx_packets: number of RX/TX MSDUs | 195 | * @tx_packets: number of RX/TX MSDUs |
| 196 | * @tx_bytes: number of bytes transmitted to this STA | 196 | * @tx_bytes: number of bytes transmitted to this STA |
| 197 | * @tx_fragments: number of transmitted MPDUs | 197 | * @tx_fragments: number of transmitted MPDUs |
| 198 | * @last_txrate: description of the last used transmit rate | ||
| 199 | * @tid_seq: per-TID sequence numbers for sending to this STA | 198 | * @tid_seq: per-TID sequence numbers for sending to this STA |
| 200 | * @ampdu_mlme: A-MPDU state machine state | 199 | * @ampdu_mlme: A-MPDU state machine state |
| 201 | * @timer_to_tid: identity mapping to ID timers | 200 | * @timer_to_tid: identity mapping to ID timers |