aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-02-10 10:49:38 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:37:07 -0500
commit3330d7be7008fa8e213648750fc13613eecc54bb (patch)
tree89f8ce89b984819144d6643e7c4a5e7e2d67e7cc /include
parentbb1eeff12d4cd6c706ef9fae340a9c93bb41ad05 (diff)
mac80211: give burst time in txop rather than 0.1msec units
This changes mac80211 to pass the burst time to conf_tx in txop units rather than 0.1msec units. 0.1msec units are only required by atheros hardware (according to current driver support), all other drivers do other calculations or require the txop value. Therefore, it results in fewer calculations and more precision if we just pass the txop value through to the driver. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/net/mac80211.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 460da54a0019..5ecf3cc8d977 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -89,19 +89,19 @@ struct ieee80211_ht_bss_info {
89 * struct ieee80211_tx_queue_params - transmit queue configuration 89 * struct ieee80211_tx_queue_params - transmit queue configuration
90 * 90 *
91 * The information provided in this structure is required for QoS 91 * The information provided in this structure is required for QoS
92 * transmit queue configuration. 92 * transmit queue configuration. Cf. IEEE 802.11 7.3.2.29.
93 * 93 *
94 * @aifs: arbitration interface space [0..255, -1: use default] 94 * @aifs: arbitration interface space [0..255, -1: use default]
95 * @cw_min: minimum contention window [will be a value of the form 95 * @cw_min: minimum contention window [will be a value of the form
96 * 2^n-1 in the range 1..1023; 0: use default] 96 * 2^n-1 in the range 1..1023; 0: use default]
97 * @cw_max: maximum contention window [like @cw_min] 97 * @cw_max: maximum contention window [like @cw_min]
98 * @burst_time: maximum burst time in units of 0.1ms, 0 meaning disabled 98 * @txop: maximum burst time in units of 32 usecs, 0 meaning disabled
99 */ 99 */
100struct ieee80211_tx_queue_params { 100struct ieee80211_tx_queue_params {
101 int aifs; 101 s16 aifs;
102 int cw_min; 102 u16 cw_min;
103 int cw_max; 103 u16 cw_max;
104 int burst_time; 104 u16 txop;
105}; 105};
106 106
107/** 107/**