diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-04-29 11:18:59 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-07 15:02:26 -0400 |
commit | 57ffc589a92424f9def74fe0d49b2f7763ff07fd (patch) | |
tree | 2ec3f60cac2e5757206dee219e7b3a60ded13004 /include | |
parent | 3e0d4cb12f6fd97193a455b49125398b2231c87c (diff) |
mac80211: clean up get_tx_stats callback
The callback takes a ieee80211_tx_queue_stats with a contained
array of ieee80211_tx_queue_stats_data, remove the former, rename
the latter to ieee80211_tx_queue_stats and make tx_stats() take
the array directly.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/mac80211.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 740c11ca066c..346a7563ef02 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -117,13 +117,13 @@ struct ieee80211_tx_queue_params { | |||
117 | }; | 117 | }; |
118 | 118 | ||
119 | /** | 119 | /** |
120 | * struct ieee80211_tx_queue_stats_data - transmit queue statistics | 120 | * struct ieee80211_tx_queue_stats - transmit queue statistics |
121 | * | 121 | * |
122 | * @len: number of packets in queue | 122 | * @len: number of packets in queue |
123 | * @limit: queue length limit | 123 | * @limit: queue length limit |
124 | * @count: number of frames sent | 124 | * @count: number of frames sent |
125 | */ | 125 | */ |
126 | struct ieee80211_tx_queue_stats_data { | 126 | struct ieee80211_tx_queue_stats { |
127 | unsigned int len; | 127 | unsigned int len; |
128 | unsigned int limit; | 128 | unsigned int limit; |
129 | unsigned int count; | 129 | unsigned int count; |
@@ -165,10 +165,6 @@ enum ieee80211_tx_queue { | |||
165 | NUM_TX_DATA_QUEUES_AMPDU = 16 | 165 | NUM_TX_DATA_QUEUES_AMPDU = 16 |
166 | }; | 166 | }; |
167 | 167 | ||
168 | struct ieee80211_tx_queue_stats { | ||
169 | struct ieee80211_tx_queue_stats_data data[NUM_TX_DATA_QUEUES_AMPDU]; | ||
170 | }; | ||
171 | |||
172 | struct ieee80211_low_level_stats { | 168 | struct ieee80211_low_level_stats { |
173 | unsigned int dot11ACKFailureCount; | 169 | unsigned int dot11ACKFailureCount; |
174 | unsigned int dot11RTSFailureCount; | 170 | unsigned int dot11RTSFailureCount; |
@@ -1083,9 +1079,8 @@ enum ieee80211_ampdu_mlme_action { | |||
1083 | * @get_tx_stats: Get statistics of the current TX queue status. This is used | 1079 | * @get_tx_stats: Get statistics of the current TX queue status. This is used |
1084 | * to get number of currently queued packets (queue length), maximum queue | 1080 | * to get number of currently queued packets (queue length), maximum queue |
1085 | * size (limit), and total number of packets sent using each TX queue | 1081 | * size (limit), and total number of packets sent using each TX queue |
1086 | * (count). This information is used for WMM to find out which TX | 1082 | * (count). The 'stats' pointer points to an array that has hw->queues + |
1087 | * queues have room for more packets and by hostapd to provide | 1083 | * hw->ampdu_queues items. |
1088 | * statistics about the current queueing state to external programs. | ||
1089 | * | 1084 | * |
1090 | * @get_tsf: Get the current TSF timer value from firmware/hardware. Currently, | 1085 | * @get_tsf: Get the current TSF timer value from firmware/hardware. Currently, |
1091 | * this is only used for IBSS mode debugging and, as such, is not a | 1086 | * this is only used for IBSS mode debugging and, as such, is not a |