projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-trans-pcie.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index
836caf9
..
f5cb5d3
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@
-1554,6
+1554,7
@@
static int iwl_trans_pcie_reclaim(struct iwl_trans *trans, int sta_id, int tid,
txq->time_stamp = jiffies;
if (unlikely(txq_id >= IWLAGN_FIRST_AMPDU_QUEUE &&
+ tid != IWL_TID_NON_QOS &&
txq_id != trans_pcie->agg_txq[sta_id][tid])) {
/*
* FIXME: this is a uCode bug which need to be addressed,