Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes (0b21eb9a) · Commits · e / devices / android_kernel_teracube_2e

drivers/net/wireless/iwlwifi/pcie/tx.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -576,10 +576,16 @@ static void iwl_pcie_txq_unmap(struct iwl_trans *trans, int txq_id)

		spin_lock_bh(&txq->lock);
		while (q->write_ptr != q->read_ptr) {
		IWL_DEBUG_TX_REPLY(trans, "Q %d Free %d\n",
		txq_id, q->read_ptr);
		iwl_pcie_txq_free_tfd(trans, txq);
		q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd);
		}
		txq->active = false;
		spin_unlock_bh(&txq->lock);

		/* just in case - this queue may have been stopped */
		iwl_wake_queue(trans, txq);
		}

		/*
		@@ -927,6 +933,12 @@ void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,

		spin_lock_bh(&txq->lock);

		if (!txq->active) {
		IWL_DEBUG_TX_QUEUES(trans, "Q %d inactive - ignoring idx %d\n",
		txq_id, ssn);
		goto out;
		}

		if (txq->q.read_ptr == tfd_num)
		goto out;

		@@ -1108,6 +1120,7 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,
		(fifo << SCD_QUEUE_STTS_REG_POS_TXF) \|
		(1 << SCD_QUEUE_STTS_REG_POS_WSL) \|
		SCD_QUEUE_STTS_REG_MSK);
		trans_pcie->txq[txq_id].active = true;
		IWL_DEBUG_TX_QUEUES(trans, "Activate queue %d on FIFO %d WrPtr: %d\n",
		txq_id, fifo, ssn & 0xff);
		}