5 files changed, 27 insertions, 21 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 4ad26f7613c5..bb3a5f633227 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -7442,7 +7442,7 @@ static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, int queue,
         priv->qos_data.def_qos_parm.ac[q].cw_max = cpu_to_le16(params->cw_max);
         priv->qos_data.def_qos_parm.ac[q].aifsn = params->aifs;
         priv->qos_data.def_qos_parm.ac[q].edca_txop =
-                        cpu_to_le16((params->burst_time * 100));
+                        cpu_to_le16((params->txop * 32));
 
         priv->qos_data.def_qos_parm.ac[q].reserved1 = 0;
         priv->qos_data.qos_active = 1;
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index f8931993ab70..fb4c84e31932 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -7916,7 +7916,7 @@ static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, int queue,
         priv->qos_data.def_qos_parm.ac[q].cw_max = cpu_to_le16(params->cw_max);
         priv->qos_data.def_qos_parm.ac[q].aifsn = params->aifs;
         priv->qos_data.def_qos_parm.ac[q].edca_txop =
-                        cpu_to_le16((params->burst_time * 100));
+                        cpu_to_le16((params->txop * 32));
 
         priv->qos_data.def_qos_parm.ac[q].reserved1 = 0;
         priv->qos_data.qos_active = 1;
diff --git a/drivers/net/wireless/p54common.c b/drivers/net/wireless/p54common.c
index 218ff7770ef6..0e9f887178ce 100644
--- a/drivers/net/wireless/p54common.c
+++ b/drivers/net/wireless/p54common.c
@@ -759,13 +759,12 @@ static int p54_set_leds(struct ieee80211_hw *dev, int mode, int link, int act)
         return 0;
 }
 
-#define P54_SET_QUEUE(queue, ai_fs, cw_min, cw_max, burst)      \
+#define P54_SET_QUEUE(queue, ai_fs, cw_min, cw_max, _txop)      \
 do {                                                            \
         queue.aifs = cpu_to_le16(ai_fs);                        \
         queue.cwmin = cpu_to_le16(cw_min);                      \
         queue.cwmax = cpu_to_le16(cw_max);                      \
-        queue.txop = (burst == 0) ?                             \
-                0 : cpu_to_le16((burst * 100) / 32 + 1);        \
+        queue.txop = cpu_to_le16(_txop);                        \
 } while(0)
 
 static void p54_init_vdcf(struct ieee80211_hw *dev)
@@ -783,10 +782,16 @@ static void p54_init_vdcf(struct ieee80211_hw *dev)
 
         vdcf = (struct p54_tx_control_vdcf *) hdr->data;
 
-        P54_SET_QUEUE(vdcf->queue[0], 0x0002, 0x0003, 0x0007, 0x000f);
-        P54_SET_QUEUE(vdcf->queue[1], 0x0002, 0x0007, 0x000f, 0x001e);
-        P54_SET_QUEUE(vdcf->queue[2], 0x0002, 0x000f, 0x03ff, 0x0014);
-        P54_SET_QUEUE(vdcf->queue[3], 0x0007, 0x000f, 0x03ff, 0x0000);
+        /*
+         * FIXME: The default values in the spec (IEEE 802.11
+         *        7.3.2.19 Table 37) are 47, 94, 0, 0, why use
+         *        47, 94, 63, 0 here? Also, the default AIFS
+         *        values (second parameter) are 2, 2, 3, 7...
+         */
+        P54_SET_QUEUE(vdcf->queue[0], 0x0002, 0x0003, 0x0007, 47);
+        P54_SET_QUEUE(vdcf->queue[1], 0x0002, 0x0007, 0x000f, 94);
+        P54_SET_QUEUE(vdcf->queue[2], 0x0002, 0x000f, 0x03ff, 63);
+        P54_SET_QUEUE(vdcf->queue[3], 0x0007, 0x000f, 0x03ff, 0);
 }
 
 static void p54_set_vdcf(struct ieee80211_hw *dev)
@@ -939,7 +944,7 @@ static int p54_conf_tx(struct ieee80211_hw *dev, int queue,
 
         if ((params) && !((queue < 0) || (queue > 4))) {
                 P54_SET_QUEUE(vdcf->queue[queue], params->aifs,
-                        params->cw_min, params->cw_max, params->burst_time);
+                        params->cw_min, params->cw_max, params->txop);
         } else
                 return -EINVAL;
 
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 {
  * struct ieee80211_tx_queue_params - transmit queue configuration
  *
  * The information provided in this structure is required for QoS
- * transmit queue configuration.
+ * transmit queue configuration. Cf. IEEE 802.11 7.3.2.29.
  *
  * @aifs: arbitration interface space [0..255, -1: use default]
  * @cw_min: minimum contention window [will be a value of the form
  *      2^n-1 in the range 1..1023; 0: use default]
  * @cw_max: maximum contention window [like @cw_min]
- * @burst_time: maximum burst time in units of 0.1ms, 0 meaning disabled
+ * @txop: maximum burst time in units of 32 usecs, 0 meaning disabled
  */
 struct ieee80211_tx_queue_params {
-        int aifs;
-        int cw_min;
-        int cw_max;
-        int burst_time;
+        s16 aifs;
+        u16 cw_min;
+        u16 cw_max;
+        u16 txop;
 };
 
 /**
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index a8251a23917b..11f2ee6b2269 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -297,12 +297,13 @@ static void ieee80211_sta_wmm_params(struct net_device *dev,
                 params.aifs = pos[0] & 0x0f;
                 params.cw_max = ecw2cw((pos[1] & 0xf0) >> 4);
                 params.cw_min = ecw2cw(pos[1] & 0x0f);
-                /* TXOP is in units of 32 usec; burst_time in 0.1 ms */
-                params.burst_time = (pos[2] | (pos[3] << 8)) * 32 / 100;
+                params.txop = pos[2] | (pos[3] << 8);
+#ifdef CONFIG_MAC80211_DEBUG
                 printk(KERN_DEBUG "%s: WMM queue=%d aci=%d acm=%d aifs=%d "
-                       "cWmin=%d cWmax=%d burst=%d\n",
+                       "cWmin=%d cWmax=%d txop=%d\n",
                        dev->name, queue, aci, acm, params.aifs, params.cw_min,
-                       params.cw_max, params.burst_time);
+                       params.cw_max, params.txop);
+#endif
                 /* TODO: handle ACM (block TX, fallback to next lowest allowed
                  * AC for now) */
                 if (local->ops->conf_tx(local_to_hw(local), queue, &params)) {
@@ -3230,7 +3231,7 @@ int ieee80211_sta_set_ssid(struct net_device *dev, char *ssid, size_t len)
                         qparam.cw_min = 15;
 
                 qparam.cw_max = 1023;
-                qparam.burst_time = 0;
+                qparam.txop = 0;
 
                 for (i = IEEE80211_TX_QUEUE_DATA0; i < NUM_TX_DATA_QUEUES; i++)
                         local->ops->conf_tx(local_to_hw(local),