Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de74c455 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: pcie: remove the active field in struct iwl_txq 



We already have queue_used in the transport - we can
use it instead.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent b9f91620

drivers/net/wireless/intel/iwlwifi/pcie/internal.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -237,7 +237,6 @@ struct iwl_pcie_first_tb_buf { 
 * @stuck_timer: timer that fires if queue gets stuck

 * @stuck_timer: timer that fires if queue gets stuck

 * @trans_pcie: pointer back to transport (for timer)

 * @trans_pcie: pointer back to transport (for timer)

 * @need_update: indicates need to update read/write index

 * @need_update: indicates need to update read/write index

 * @active: stores if queue is active

 * @ampdu: true if this queue is an ampdu queue for an specific RA/TID

 * @ampdu: true if this queue is an ampdu queue for an specific RA/TID

 * @wd_timeout: queue watchdog timeout (jiffies) - per queue

 * @wd_timeout: queue watchdog timeout (jiffies) - per queue

 * @frozen: tx stuck queue timer is frozen

 * @frozen: tx stuck queue timer is frozen
@@ -277,7 +276,6 @@ struct iwl_txq { 
	struct iwl_trans_pcie *trans_pcie;

	struct iwl_trans_pcie *trans_pcie;

	bool need_update;

	bool need_update;

	bool frozen;

	bool frozen;

	u8 active;

	bool ampdu;

	bool ampdu;

	int block;

	int block;

	unsigned long wd_timeout;

	unsigned long wd_timeout;

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

+3 −4
Original line number Original line Diff line number Diff line
@@ -701,7 +701,6 @@ static void iwl_pcie_txq_unmap(struct iwl_trans *trans, int txq_id) 
			spin_unlock_irqrestore(&trans_pcie->reg_lock, flags);

			spin_unlock_irqrestore(&trans_pcie->reg_lock, flags);

		}

		}

	}

	}

	txq->active = false;





	while (!skb_queue_empty(&txq->overflow_q)) {

	while (!skb_queue_empty(&txq->overflow_q)) {

		struct sk_buff *skb = __skb_dequeue(&txq->overflow_q);

		struct sk_buff *skb = __skb_dequeue(&txq->overflow_q);
@@ -932,6 +931,8 @@ void iwl_pcie_tx_free(struct iwl_trans *trans) 
	int txq_id;

	int txq_id;

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);





	memset(trans_pcie->queue_used, 0, sizeof(trans_pcie->queue_used));



	/* Tx queues */

	/* Tx queues */

	if (trans_pcie->txq) {

	if (trans_pcie->txq) {

		for (txq_id = 0;

		for (txq_id = 0;
@@ -1107,7 +1108,7 @@ void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn, 




	spin_lock_bh(&txq->lock);

	spin_lock_bh(&txq->lock);





	if (!txq->active) {

	if (!test_bit(txq_id, trans_pcie->queue_used)) {

		IWL_DEBUG_TX_QUEUES(trans, "Q %d inactive - ignoring idx %d\n",

		IWL_DEBUG_TX_QUEUES(trans, "Q %d inactive - ignoring idx %d\n",

				    txq_id, ssn);

				    txq_id, ssn);

		goto out;

		goto out;
@@ -1411,8 +1412,6 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, u16 ssn, 
				    "Activate queue %d WrPtr: %d\n",

				    "Activate queue %d WrPtr: %d\n",

				    txq_id, ssn & 0xff);

				    txq_id, ssn & 0xff);

	}

	}



	txq->active = true;

}

}





void iwl_trans_pcie_txq_set_shared_mode(struct iwl_trans *trans, u32 txq_id,

void iwl_trans_pcie_txq_set_shared_mode(struct iwl_trans *trans, u32 txq_id,