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

Commit 8567c63e authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: rename iwl4965_tx_info to iwl_tx_info 



This patch renames iwl4965_tx_info to iwl_tx_info.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 443cfd45

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

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ struct iwl_queue { 
#define MAX_NUM_OF_TBS          (20)



/* One for each TFD */

struct iwl4965_tx_info {

struct iwl_tx_info {

	struct ieee80211_tx_status status;

	struct sk_buff *skb[MAX_NUM_OF_TBS];

};
@@ -141,7 +141,7 @@ struct iwl_tx_queue { 
	struct iwl_tfd_frame *bd;

	struct iwl_cmd *cmd;

	dma_addr_t dma_addr_cmd;

	struct iwl4965_tx_info *txb;

	struct iwl_tx_info *txb;

	int need_update;

	int sched_retry;

	int active;

drivers/net/wireless/iwlwifi/iwl4965-base.c

+2 −2
Original line number Diff line number Diff line
@@ -1868,7 +1868,7 @@ static int iwl4965_tx_skb(struct iwl_priv *priv, 
	idx = get_cmd_index(q, q->write_ptr, 0);



	/* Set up driver data for this TFD */

	memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl4965_tx_info));

	memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));

	txq->txb[q->write_ptr].skb[0] = skb;

	memcpy(&(txq->txb[q->write_ptr].status.control),

	       ctl, sizeof(struct ieee80211_tx_control));
@@ -2306,7 +2306,7 @@ static int iwl4965_get_measurement(struct iwl_priv *priv, 
#endif



static void iwl4965_txstatus_to_ieee(struct iwl_priv *priv,

				 struct iwl4965_tx_info *tx_sta)

				     struct iwl_tx_info *tx_sta)

{



	tx_sta->status.ack_signal = 0;