diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 14:10:24 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 14:10:24 -0400 |
commit | d72c728210fa803a21203360c0f40b32972d795a (patch) | |
tree | 95189c1a9181e3317dea2a139f390f5013e921a2 /drivers/net/wireless/iwlwifi/pcie/tx.c | |
parent | 655d8e2328a6ef6b6b514609a4c1e33508d3a1da (diff) | |
parent | 2d055afdcada4bd8b510e9d2a8566fbded3c9696 (diff) | |
download | blackbird-op-linux-d72c728210fa803a21203360c0f40b32972d795a.tar.gz blackbird-op-linux-d72c728210fa803a21203360c0f40b32972d795a.zip |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/tx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/tx.c | 2 |
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 c3f15df67b9a..d97c1fad7bc3 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, iwl_set_bits_prph(trans, SCD_QUEUECHAIN_SEL, BIT(txq_id)); /* If this queue is mapped to a certain station: it is an AGG queue */ - if (sta_id != IWL_INVALID_STATION) { + if (sta_id >= 0) { u16 ra_tid = BUILD_RAxTID(sta_id, tid); /* Map receiver-address / traffic-ID to this queue */ |