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>

3 files changed, 15 insertions, 10 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;