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

Commit d0624be6 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: s/txq_agg_disable/txq_disable 



We need to be able to enable / disable Tx queues in HW
dynamically. So this function is no longer related to AGG
only. It can do the job for any queue, even AC ones. Change
the name to better reflect its role.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 559b1a25

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

+3 −3
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif, 
		 * time, or we hadn't time to drain the AC queues.

		 */

		if (agg_state == IWL_AGG_ON)

			iwl_trans_tx_agg_disable(priv->trans, txq_id);

			iwl_trans_txq_disable(priv->trans, txq_id);

		else

			IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n",

					    agg_state);
@@ -755,7 +755,7 @@ static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid) 
			IWL_DEBUG_TX_QUEUES(priv,

				"Can continue DELBA flow ssn = next_recl ="

				" %d", tid_data->next_reclaimed);

			iwl_trans_tx_agg_disable(priv->trans,

			iwl_trans_txq_disable(priv->trans,

					      tid_data->agg.txq_id);

			iwlagn_dealloc_agg_txq(priv, tid_data->agg.txq_id);

			tid_data->agg.state = IWL_AGG_OFF;

drivers/net/wireless/iwlwifi/iwl-trans.h

+4 −4
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ struct iwl_trans; 
 * @tx_agg_setup: setup a tx queue for AMPDU - will be called once the HW is

 *	ready and a successful ADDBA response has been received.

 *	May sleep

 * @tx_agg_disable: de-configure a Tx queue to send AMPDUs

 * @txq_disable: de-configure a Tx queue to send AMPDUs

 *	Must be atomic

 * @wait_tx_queue_empty: wait until all tx queues are empty

 *	May sleep
@@ -393,7 +393,7 @@ struct iwl_trans_ops { 


	void (*tx_agg_setup)(struct iwl_trans *trans, int queue, int fifo,

			     int sta_id, int tid, int frame_limit, u16 ssn);

	void (*tx_agg_disable)(struct iwl_trans *trans, int queue);

	void (*txq_disable)(struct iwl_trans *trans, int queue);



	int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir);

	int (*wait_tx_queue_empty)(struct iwl_trans *trans);
@@ -543,12 +543,12 @@ static inline void iwl_trans_reclaim(struct iwl_trans *trans, int queue, 
	trans->ops->reclaim(trans, queue, ssn, skbs);

}



static inline void iwl_trans_tx_agg_disable(struct iwl_trans *trans, int queue)

static inline void iwl_trans_txq_disable(struct iwl_trans *trans, int queue)

{

	WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,

		  "%s bad state = %d", __func__, trans->state);



	trans->ops->tx_agg_disable(trans, queue);

	trans->ops->txq_disable(trans, queue);

}



static inline void iwl_trans_tx_agg_setup(struct iwl_trans *trans, int queue,

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

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans, 
void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_trans *trans,

				       struct iwl_tx_queue *txq,

				       u16 byte_cnt);

void iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int queue);

void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int queue);

void iwl_trans_set_wr_ptrs(struct iwl_trans *trans, int txq_id, u32 index);

void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,

				   struct iwl_tx_queue *txq,

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

+1 −1
Original line number Diff line number Diff line
@@ -2039,7 +2039,7 @@ static const struct iwl_trans_ops trans_ops_pcie = { 
	.tx = iwl_trans_pcie_tx,

	.reclaim = iwl_trans_pcie_reclaim,



	.tx_agg_disable = iwl_trans_pcie_tx_agg_disable,

	.txq_disable = iwl_trans_pcie_txq_disable,

	.tx_agg_setup = iwl_trans_pcie_tx_agg_setup,



	.dbgfs_register = iwl_trans_pcie_dbgfs_register,

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

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, int txq_id, int fifo, 
	spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);

}



void iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int txq_id)

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