Commit 1ff504e0 authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

iwlwifi: move iwl_free_tfds_in_queue to iwlagn 



This function is only used by the agn drivers,
so doesn't have to be in core and exported.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent f862a236

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+13 −0
Original line number Diff line number Diff line
@@ -1529,3 +1529,16 @@ int iwlagn_manage_ibss_station(struct iwl_priv *priv, 
	return iwl_remove_station(priv, vif_priv->ibss_bssid_sta_id,

				  vif->bss_conf.bssid);

}



void iwl_free_tfds_in_queue(struct iwl_priv *priv,

			    int sta_id, int tid, int freed)

{

	if (priv->stations[sta_id].tid[tid].tfds_in_queue >= freed)

		priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;

	else {

		IWL_DEBUG_TX(priv, "free more than tfds_in_queue (%u:%d)\n",

			priv->stations[sta_id].tid[tid].tfds_in_queue,

			freed);

		priv->stations[sta_id].tid[tid].tfds_in_queue = 0;

	}

}

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

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ int iwlagn_txq_agg_enable(struct iwl_priv *priv, int txq_id, 
int iwlagn_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,

			   u16 ssn_idx, u8 tx_fifo);

void iwlagn_txq_set_sched(struct iwl_priv *priv, u32 mask);

void iwl_free_tfds_in_queue(struct iwl_priv *priv,

			    int sta_id, int tid, int freed);



/* uCode */

int iwlagn_load_ucode(struct iwl_priv *priv);

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

+0 −2
Original line number Diff line number Diff line
@@ -472,8 +472,6 @@ int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, 
				 dma_addr_t addr, u16 len, u8 reset, u8 pad);

int iwl_hw_tx_queue_init(struct iwl_priv *priv,

			 struct iwl_tx_queue *txq);

void iwl_free_tfds_in_queue(struct iwl_priv *priv,

			    int sta_id, int tid, int freed);

void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);

int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,

		      int slots_num, u32 txq_id);

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

+0 −15
Original line number Diff line number Diff line
@@ -76,21 +76,6 @@ void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq) 
}

EXPORT_SYMBOL(iwl_txq_update_write_ptr);





void iwl_free_tfds_in_queue(struct iwl_priv *priv,

			    int sta_id, int tid, int freed)

{

	if (priv->stations[sta_id].tid[tid].tfds_in_queue >= freed)

		priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;

	else {

		IWL_DEBUG_TX(priv, "free more than tfds_in_queue (%u:%d)\n",

			priv->stations[sta_id].tid[tid].tfds_in_queue,

			freed);

		priv->stations[sta_id].tid[tid].tfds_in_queue = 0;

	}

}

EXPORT_SYMBOL(iwl_free_tfds_in_queue);



/**

 * iwl_tx_queue_free - Deallocate DMA queue.

 * @txq: Transmit queue to deallocate.

CRA Git | Maintained and supported by SUSTech CRA and CCSE