rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't WARN_ON empty queues in iwlwifi (rhbz 873001)

This commit is contained in:
Josh Boyer 2012-11-16 08:39:48 -05:00
parent 7a2a907f6d
commit df9f4ec79e
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
iwlwifi-remove-queue-empty-warn-3.6.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index 105e3af..79a4ddc 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -480,20 +480,12 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,
void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id)
{
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
- u16 rd_ptr, wr_ptr;
- int n_bd = trans_pcie->txq[txq_id].q.n_bd;
if (!test_and_clear_bit(txq_id, trans_pcie->queue_used)) {
WARN_ONCE(1, "queue %d not used", txq_id);
return;
}
- rd_ptr = iwl_read_prph(trans, SCD_QUEUE_RDPTR(txq_id)) & (n_bd - 1);
- wr_ptr = iwl_read_prph(trans, SCD_QUEUE_WRPTR(txq_id));
-
- WARN_ONCE(rd_ptr != wr_ptr, "queue %d isn't empty: [%d,%d]",
- txq_id, rd_ptr, wr_ptr);
-
iwl_txq_set_inactive(trans, txq_id);
IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", txq_id);
}

15
kernel.spec
View File

@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
%global baserelease 2
%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -710,8 +710,12 @@ Patch22110: usb-audio-fix-crash-at-re-preparing-the-PCM-stream.patch
Patch22111: USB-EHCI-urb-hcpriv-should-not-be-NULL.patch
Patch22112: USB-report-submission-of-active-URBs.patch
#rhbz 869341
Patch22113: smp_irq_move_cleanup_interrupt.patch
#rhbz 873001
Patch22114: iwlwifi-remove-queue-empty-warn-3.6.patch
# END OF PATCH DEFINITIONS
%endif
@ -1339,8 +1343,12 @@ ApplyPatch usb-audio-fix-crash-at-re-preparing-the-PCM-stream.patch
ApplyPatch USB-EHCI-urb-hcpriv-should-not-be-NULL.patch
ApplyPatch USB-report-submission-of-active-URBs.patch
#rhbz 869341
ApplyPatch smp_irq_move_cleanup_interrupt.patch
#rhbz 873001
ApplyPatch iwlwifi-remove-queue-empty-warn-3.6.patch
# END OF PATCH APPLICATIONS
%endif
@ -2041,8 +2049,11 @@ fi
# and build.
%changelog
* Fri Nov 16 2012 Josh Boyer <jwboyer@redhat.com>
- Don't WARN_ON empty queues in iwlwifi (rhbz 873001)
* Thu Nov 15 2012 Justin M. Forbes <jforbes@redhat.com>
- Fix panic in panic in smp_irq_move_cleanup_interrupt
- Fix panic in panic in smp_irq_move_cleanup_interrupt (rhbz 869341)
* Mon Nov 12 2012 Justin M. Forbes <jforbes@redhat.com>
- fix list_del corruption warning on USB audio with twinkle (rhbz 871078)