Commit 70a18c5d authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: move tid_to_ac to PCI-E 



Currently, queue mapping is handled in the
transport. This may change, but until then
the code for it can be close to where it's
used rather than in iwl-shared.h.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 930dfd5f

drivers/net/wireless/iwlwifi/iwl-shared.h

+0 −46
Original line number Diff line number Diff line
@@ -412,52 +412,6 @@ static inline bool iwl_have_debug_level(u32 level) 
	return iwlagn_mod_params.debug_level & level;

}



/*

 * mac80211 queues, ACs, hardware queues, FIFOs.

 *

 * Cf. http://wireless.kernel.org/en/developers/Documentation/mac80211/queues

 *

 * Mac80211 uses the following numbers, which we get as from it

 * by way of skb_get_queue_mapping(skb):

 *

 *	VO	0

 *	VI	1

 *	BE	2

 *	BK	3

 *

 *

 * Regular (not A-MPDU) frames are put into hardware queues corresponding

 * to the FIFOs, see comments in iwl-prph.h. Aggregated frames get their

 * own queue per aggregation session (RA/TID combination), such queues are

 * set up to map into FIFOs too, for which we need an AC->FIFO mapping. In

 * order to map frames to the right queue, we also need an AC->hw queue

 * mapping. This is implemented here.

 *

 * Due to the way hw queues are set up (by the hw specific modules like

 * iwl-4965.c, iwl-5000.c etc.), the AC->hw queue mapping is the identity

 * mapping.

 */



static const u8 tid_to_ac[] = {

	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)

{

	if (likely(tid < ARRAY_SIZE(tid_to_ac)))

		return tid_to_ac[tid];



	/* no support for TIDs 8-15 yet */

	return -EINVAL;

}



enum iwl_rxon_context_id {

	IWL_RXON_CTX_BSS,

	IWL_RXON_CTX_PAN,

drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c

+46 −0
Original line number Diff line number Diff line
@@ -41,6 +41,43 @@ 
#define IWL_TX_CRC_SIZE 4

#define IWL_TX_DELIMITER_SIZE 4



/*

 * mac80211 queues, ACs, hardware queues, FIFOs.

 *

 * Cf. http://wireless.kernel.org/en/developers/Documentation/mac80211/queues

 *

 * Mac80211 uses the following numbers, which we get as from it

 * by way of skb_get_queue_mapping(skb):

 *

 *	VO	0

 *	VI	1

 *	BE	2

 *	BK	3

 *

 *

 * Regular (not A-MPDU) frames are put into hardware queues corresponding

 * to the FIFOs, see comments in iwl-prph.h. Aggregated frames get their

 * own queue per aggregation session (RA/TID combination), such queues are

 * set up to map into FIFOs too, for which we need an AC->FIFO mapping. In

 * order to map frames to the right queue, we also need an AC->hw queue

 * mapping. This is implemented here.

 *

 * Due to the way hw queues are set up (by the hw specific code), the AC->hw

 * queue mapping is the identity mapping.

 */



static const u8 tid_to_ac[] = {

	IEEE80211_AC_BE,

	IEEE80211_AC_BK,

	IEEE80211_AC_BK,

	IEEE80211_AC_BE,

	IEEE80211_AC_VI,

	IEEE80211_AC_VI,

	IEEE80211_AC_VO,

	IEEE80211_AC_VO

};





/**

 * iwl_trans_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array

 */
@@ -442,6 +479,15 @@ void iwl_trans_tx_queue_set_status(struct iwl_trans *trans, 
			scd_retry ? "BA" : "AC/CMD", txq_id);

}



static inline int get_ac_from_tid(u16 tid)

{

	if (likely(tid < ARRAY_SIZE(tid_to_ac)))

		return tid_to_ac[tid];



	/* no support for TIDs 8-15 yet */

	return -EINVAL;

}



static inline int get_fifo_from_tid(struct iwl_trans_pcie *trans_pcie,

				    u8 ctx, u16 tid)

{