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

Commit 4c42db0f authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlagn: remove unused pad argument 



The pad argument to iwlagn_txq_free_tfd
isn't used, remove it.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -750,10 +750,10 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	spin_unlock(&priv->sta_lock);



	/* Attach buffers to TFD */

	iwlagn_txq_attach_buf_to_tfd(priv, txq, txcmd_phys, firstlen, 1, 0);

	iwlagn_txq_attach_buf_to_tfd(priv, txq, txcmd_phys, firstlen, 1);

	if (secondlen > 0)

		iwlagn_txq_attach_buf_to_tfd(priv, txq, phys_addr,

					     secondlen, 0, 0);

					     secondlen, 0);



	scratch_phys = txcmd_phys + sizeof(struct iwl_cmd_header) +

				offsetof(struct iwl_tx_cmd, scratch);

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

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ void iwl_setup_rx_handlers(struct iwl_priv *priv); 
void iwlagn_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq);

int iwlagn_txq_attach_buf_to_tfd(struct iwl_priv *priv,

				 struct iwl_tx_queue *txq,

				 dma_addr_t addr, u16 len, u8 reset, u8 pad);

				 dma_addr_t addr, u16 len, u8 reset);

void iwlagn_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags,

			      struct ieee80211_tx_info *info);

int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb);

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

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ 
#include "iwl-agn-rs.h"

#include "iwl-agn-tt.h"



#define U32_PAD(n)		((4-(n))&0x3)



struct iwl_tx_queue;



/* CT-KILL constants */

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

+2 −3
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ void iwlagn_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq) 
int iwlagn_txq_attach_buf_to_tfd(struct iwl_priv *priv,

				 struct iwl_tx_queue *txq,

				 dma_addr_t addr, u16 len,

				 u8 reset, u8 pad)

				 u8 reset)

{

	struct iwl_queue *q;

	struct iwl_tfd *tfd, *tfd_tmp;
@@ -702,8 +702,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 


	trace_iwlwifi_dev_hcmd(priv, &out_cmd->hdr, fix_size, cmd->flags);



	iwlagn_txq_attach_buf_to_tfd(priv, txq, phys_addr, fix_size, 1,

				     U32_PAD(cmd->len[0]));

	iwlagn_txq_attach_buf_to_tfd(priv, txq, phys_addr, fix_size, 1);



	/* Increment and update queue's write index */

	q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);