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

Commit 94b00658 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlagn: remove bytecount indirection 



All AGN devices need the bytecount table, so
remove the indirection and make the functions
static again.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent ccb6c1c0

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

+0 −2
Original line number Diff line number Diff line
@@ -171,8 +171,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 


static struct iwl_lib_ops iwl1000_lib = {

	.set_hw_params = iwl1000_hw_set_hw_params,

	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,

	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

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

+0 −2
Original line number Diff line number Diff line
@@ -252,8 +252,6 @@ static int iwl2030_hw_channel_switch(struct iwl_priv *priv, 


static struct iwl_lib_ops iwl2000_lib = {

	.set_hw_params = iwl2000_hw_set_hw_params,

	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,

	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

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

+0 −4
Original line number Diff line number Diff line
@@ -339,8 +339,6 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, 


static struct iwl_lib_ops iwl5000_lib = {

	.set_hw_params = iwl5000_hw_set_hw_params,

	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,

	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,
@@ -376,8 +374,6 @@ static struct iwl_lib_ops iwl5000_lib = { 


static struct iwl_lib_ops iwl5150_lib = {

	.set_hw_params = iwl5150_hw_set_hw_params,

	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,

	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

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

+0 −4
Original line number Diff line number Diff line
@@ -278,8 +278,6 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, 


static struct iwl_lib_ops iwl6000_lib = {

	.set_hw_params = iwl6000_hw_set_hw_params,

	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,

	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,
@@ -316,8 +314,6 @@ static struct iwl_lib_ops iwl6000_lib = { 


static struct iwl_lib_ops iwl6030_lib = {

	.set_hw_params = iwl6000_hw_set_hw_params,

	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,

	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

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

+8 −9
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static inline int get_fifo_from_tid(struct iwl_rxon_context *ctx, u16 tid) 
/**

 * iwlagn_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array

 */

void iwlagn_txq_update_byte_cnt_tbl(struct iwl_priv *priv,

static void iwlagn_txq_update_byte_cnt_tbl(struct iwl_priv *priv,

					   struct iwl_tx_queue *txq,

					   u16 byte_cnt)

{
@@ -136,7 +136,7 @@ void iwlagn_txq_update_byte_cnt_tbl(struct iwl_priv *priv, 
			tfd_offset[TFD_QUEUE_SIZE_MAX + write_ptr] = bc_ent;

}



void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_priv *priv,

static void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_priv *priv,

					  struct iwl_tx_queue *txq)

{

	struct iwlagn_scd_bc_tbl *scd_bc_tbl = priv->scd_bc_tbls.addr;
@@ -766,7 +766,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 


	/* Set up entry for this TFD in Tx byte-count array */

	if (info->flags & IEEE80211_TX_CTL_AMPDU)

		priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq,

		iwlagn_txq_update_byte_cnt_tbl(priv, txq,

					       le16_to_cpu(tx_cmd->len));



	pci_dma_sync_single_for_device(priv->pci_dev, txcmd_phys,
@@ -1246,8 +1246,7 @@ int iwlagn_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) 
				 txq_id >= IWLAGN_FIRST_AMPDU_QUEUE);

		tx_info->skb = NULL;



		if (priv->cfg->ops->lib->txq_inval_byte_cnt_tbl)

			priv->cfg->ops->lib->txq_inval_byte_cnt_tbl(priv, txq);

		iwlagn_txq_inval_byte_cnt_tbl(priv, txq);



		priv->cfg->ops->lib->txq_free_tfd(priv, txq);

	}