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

Commit 36470749 authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

iwlwifi: rename and move Tx queue activation/deactivation 



This patch moves iwl4965_txq_ctx_activate and iwl4965_txq_ctx_deactivate
to iwl-dev.h and removes 4965 prefix from their names.

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ccc038ab

drivers/net/wireless/iwlwifi/iwl-4965.c

+2 −12
Original line number Diff line number Diff line
@@ -911,16 +911,6 @@ static const u16 default_queue_to_tx_fifo[] = { 
	IWL_TX_FIFO_HCCA_2

};



static inline void iwl4965_txq_ctx_activate(struct iwl_priv *priv, int txq_id)

{

	set_bit(txq_id, &priv->txq_ctx_active_msk);

}



static inline void iwl4965_txq_ctx_deactivate(struct iwl_priv *priv, int txq_id)

{

	clear_bit(txq_id, &priv->txq_ctx_active_msk);

}



int iwl4965_alive_notify(struct iwl_priv *priv)

{

	u32 a;
@@ -998,7 +988,7 @@ int iwl4965_alive_notify(struct iwl_priv *priv) 
	/* Map each Tx/cmd queue to its corresponding fifo */

	for (i = 0; i < ARRAY_SIZE(default_queue_to_tx_fifo); i++) {

		int ac = default_queue_to_tx_fifo[i];

		iwl4965_txq_ctx_activate(priv, i);

		iwl_txq_ctx_activate(priv, i);

		iwl4965_tx_queue_set_status(priv, &priv->txq[i], ac, 0);

	}
@@ -3115,7 +3105,7 @@ static int iwl4965_tx_queue_agg_disable(struct iwl_priv *priv, u16 txq_id, 
	iwl4965_set_wr_ptrs(priv, txq_id, ssn_idx);



	iwl_clear_bits_prph(priv, IWL49_SCD_INTERRUPT_MASK, (1 << txq_id));

	iwl4965_txq_ctx_deactivate(priv, txq_id);

	iwl_txq_ctx_deactivate(priv, txq_id);

	iwl4965_tx_queue_set_status(priv, &priv->txq[txq_id], tx_fifo, 0);



	iwl_release_nic_access(priv);

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

+10 −0
Original line number Diff line number Diff line
@@ -1210,6 +1210,16 @@ struct iwl_priv { 
	struct timer_list statistics_periodic;

}; /*iwl_priv */



static inline void iwl_txq_ctx_activate(struct iwl_priv *priv, int txq_id)

{

	set_bit(txq_id, &priv->txq_ctx_active_msk);

}



static inline void iwl_txq_ctx_deactivate(struct iwl_priv *priv, int txq_id)

{

	clear_bit(txq_id, &priv->txq_ctx_active_msk);

}



static inline int iwl_is_associated(struct iwl_priv *priv)

{

	return (priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;