Attachment 645597 Details for Bug 873001 – iwlwifi-remove-queue-empty-warn-3.6.patch

iwlwifi-remove-queue-empty-warn-3.6.patch

iwlwifi-remove-queue-empty-warn-3.6.patch (text/plain), 981 bytes, created by Stanislaw Gruszka on 2012-11-15 11:22:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislaw Gruszka

Created: 2012-11-15 11:22:35 UTC

Size: 981 bytes

patch

obsolete

>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);
> }

Actions: View

Attachments on bug 873001: 645597