]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
iwlwifi: use mac80211 AC defines
authorJohannes Berg <johannes.berg@intel.com>
Wed, 17 Nov 2010 19:33:27 +0000 (11:33 -0800)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Thu, 25 Nov 2010 00:58:40 +0000 (16:58 -0800)
Instead of hardcoding the numbers that must
match mac80211, use the constants. Not that
this means we could change the constants,
but at least this way it's clearer.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c

index c114c3a704f8cdb9e46e40f5e7ab123de6926951..72b1f262796ca73ecd7cc3e8f0d4d46e2e7ec51b 100644 (file)
  */
 
 static const u8 tid_to_ac[] = {
-       /* this matches the mac80211 numbers */
-       2, 3, 3, 2, 1, 1, 0, 0
+       IEEE80211_AC_BE,
+       IEEE80211_AC_BK,
+       IEEE80211_AC_BK,
+       IEEE80211_AC_BE,
+       IEEE80211_AC_VI,
+       IEEE80211_AC_VI,
+       IEEE80211_AC_VO,
+       IEEE80211_AC_VO
 };
 
 static inline int get_ac_from_tid(u16 tid)
index 411a7a20450a975768c8b0f8f41dd0af67c79dc5..0bdd2bb0bbd315337ed887b8b7078c48e26bab30 100644 (file)
@@ -47,10 +47,10 @@ struct queue_to_fifo_ac {
 };
 
 static const struct queue_to_fifo_ac iwlagn_default_queue_to_tx_fifo[] = {
-       { IWL_TX_FIFO_VO, 0, },
-       { IWL_TX_FIFO_VI, 1, },
-       { IWL_TX_FIFO_BE, 2, },
-       { IWL_TX_FIFO_BK, 3, },
+       { IWL_TX_FIFO_VO, IEEE80211_AC_VO, },
+       { IWL_TX_FIFO_VI, IEEE80211_AC_VI, },
+       { IWL_TX_FIFO_BE, IEEE80211_AC_BE, },
+       { IWL_TX_FIFO_BK, IEEE80211_AC_BK, },
        { IWLAGN_CMD_FIFO_NUM, IWL_AC_UNSET, },
        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
@@ -60,14 +60,14 @@ static const struct queue_to_fifo_ac iwlagn_default_queue_to_tx_fifo[] = {
 };
 
 static const struct queue_to_fifo_ac iwlagn_ipan_queue_to_tx_fifo[] = {
-       { IWL_TX_FIFO_VO, 0, },
-       { IWL_TX_FIFO_VI, 1, },
-       { IWL_TX_FIFO_BE, 2, },
-       { IWL_TX_FIFO_BK, 3, },
-       { IWL_TX_FIFO_BK_IPAN, 3, },
-       { IWL_TX_FIFO_BE_IPAN, 2, },
-       { IWL_TX_FIFO_VI_IPAN, 1, },
-       { IWL_TX_FIFO_VO_IPAN, 0, },
+       { IWL_TX_FIFO_VO, IEEE80211_AC_VO, },
+       { IWL_TX_FIFO_VI, IEEE80211_AC_VI, },
+       { IWL_TX_FIFO_BE, IEEE80211_AC_BE, },
+       { IWL_TX_FIFO_BK, IEEE80211_AC_BK, },
+       { IWL_TX_FIFO_BK_IPAN, IEEE80211_AC_BK, },
+       { IWL_TX_FIFO_BE_IPAN, IEEE80211_AC_BE, },
+       { IWL_TX_FIFO_VI_IPAN, IEEE80211_AC_VI, },
+       { IWL_TX_FIFO_VO_IPAN, IEEE80211_AC_VO, },
        { IWL_TX_FIFO_BE_IPAN, 2, },
        { IWLAGN_CMD_FIFO_NUM, IWL_AC_UNSET, },
 };