aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2013-04-28 07:05:22 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-05-13 12:10:52 -0400
commitbd5f6a344daff10b58dfefad628e4b203edeb831 (patch)
tree1be21e3f326fe5abd83b3e361af00122008f6c75
parentf722406faae2d073cc1d01063d1123c35425939e (diff)
iwlwifi: move BUILD_RAxTID to transport
It has nothing to do in FW API. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/commands.h4
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/tx.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/commands.h b/drivers/net/wireless/iwlwifi/dvm/commands.h
index 95ca026ecc9d..19f3ce7646ab 100644
--- a/drivers/net/wireless/iwlwifi/dvm/commands.h
+++ b/drivers/net/wireless/iwlwifi/dvm/commands.h
@@ -838,10 +838,6 @@ struct iwl_qosparam_cmd {
838#define STA_MODIFY_DELBA_TID_MSK 0x10 838#define STA_MODIFY_DELBA_TID_MSK 0x10
839#define STA_MODIFY_SLEEP_TX_COUNT_MSK 0x20 839#define STA_MODIFY_SLEEP_TX_COUNT_MSK 0x20
840 840
841/* Receiver address (actually, Rx station's index into station table),
842 * combined with Traffic ID (QOS priority), in format used by Tx Scheduler */
843#define BUILD_RAxTID(sta_id, tid) (((sta_id) << 4) + (tid))
844
845/* agn */ 841/* agn */
846struct iwl_keyinfo { 842struct iwl_keyinfo {
847 __le16 key_flags; 843 __le16 key_flags;
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index c5e30294c5ac..03ad2f417298 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -1045,6 +1045,10 @@ static inline void iwl_pcie_txq_set_inactive(struct iwl_trans *trans,
1045 (1 << SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN)); 1045 (1 << SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));
1046} 1046}
1047 1047
1048/* Receiver address (actually, Rx station's index into station table),
1049 * combined with Traffic ID (QOS priority), in format used by Tx Scheduler */
1050#define BUILD_RAxTID(sta_id, tid) (((sta_id) << 4) + (tid))
1051
1048void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo, 1052void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,
1049 int sta_id, int tid, int frame_limit, u16 ssn) 1053 int sta_id, int tid, int frame_limit, u16 ssn)
1050{ 1054{