aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/pcie
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2013-03-19 10:16:00 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-04-03 16:49:54 -0400
commit881acd8987f6633280247087219df465de784a69 (patch)
treece3db162cafa616b531b2fed188096287618eec9 /drivers/net/wireless/iwlwifi/pcie
parent20ecf9fd3bebc4147e2996c08a75d6f0229b90df (diff)
iwlwifi: mvm: clean up invalid station handling
Using IWL_MVM_STATION_COUNT and IWL_INVALID_STATION together isn't a good idea as they have different values. Always use IWL_MVM_STATION_COUNT for an invalid station in MVM and move the definition of the IWL_INVALID_STATION constant into the DVM driver to avoid making such mistakes again. The one use in the transport code can be hard-coded to -1 instead as the station ID is passed as an integer there. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie')
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/tx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index a4508c2fa92b..a0bbb0df4ae4 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -1063,7 +1063,7 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,
1063 iwl_set_bits_prph(trans, SCD_QUEUECHAIN_SEL, BIT(txq_id)); 1063 iwl_set_bits_prph(trans, SCD_QUEUECHAIN_SEL, BIT(txq_id));
1064 1064
1065 /* If this queue is mapped to a certain station: it is an AGG queue */ 1065 /* If this queue is mapped to a certain station: it is an AGG queue */
1066 if (sta_id != IWL_INVALID_STATION) { 1066 if (sta_id >= 0) {
1067 u16 ra_tid = BUILD_RAxTID(sta_id, tid); 1067 u16 ra_tid = BUILD_RAxTID(sta_id, tid);
1068 1068
1069 /* Map receiver-address / traffic-ID to this queue */ 1069 /* Map receiver-address / traffic-ID to this queue */