Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c4ac342 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: use mac80211 AC defines 



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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 6fb5511a

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+8 −2
Original line number Diff line number Diff line
@@ -67,8 +67,14 @@ 
 */



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)

drivers/net/wireless/iwlwifi/iwl-agn-ucode.c

+12 −12
Original line number Diff line number Diff line
@@ -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, },

};