openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlwifi: rename iwl4965_tx_info to iwl_tx_info 

This patch renames iwl4965_tx_info to iwl_tx_info.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Tomas Winkler 2008-05-15 13:53:58 +08:00 committed by John W. Linville
parent 443cfd457f
commit 8567c63e33
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@ -118,7 +118,7 @@ struct iwl_queue {
#define MAX_NUM_OF_TBS (20) #define MAX_NUM_OF_TBS (20)
/* One for each TFD */ /* One for each TFD */
struct iwl4965_tx_info { struct iwl_tx_info {
struct ieee80211_tx_status status; struct ieee80211_tx_status status;
struct sk_buff *skb[MAX_NUM_OF_TBS]; struct sk_buff *skb[MAX_NUM_OF_TBS];
}; };
@ -141,7 +141,7 @@ struct iwl_tx_queue {
struct iwl_tfd_frame *bd; struct iwl_tfd_frame *bd;
struct iwl_cmd *cmd; struct iwl_cmd *cmd;
dma_addr_t dma_addr_cmd; dma_addr_t dma_addr_cmd;
struct iwl4965_tx_info *txb; struct iwl_tx_info *txb;
int need_update; int need_update;
int sched_retry; int sched_retry;
int active; int active;

4
drivers/net/wireless/iwlwifi/iwl4965-base.c
View File

@ -1868,7 +1868,7 @@ static int iwl4965_tx_skb(struct iwl_priv *priv,
idx = get_cmd_index(q, q->write_ptr, 0); idx = get_cmd_index(q, q->write_ptr, 0);
/* Set up driver data for this TFD */ /* 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; txq->txb[q->write_ptr].skb[0] = skb;
memcpy(&(txq->txb[q->write_ptr].status.control), memcpy(&(txq->txb[q->write_ptr].status.control),
ctl, sizeof(struct ieee80211_tx_control)); ctl, sizeof(struct ieee80211_tx_control));
@ -2306,7 +2306,7 @@ static int iwl4965_get_measurement(struct iwl_priv *priv,
#endif #endif
static void iwl4965_txstatus_to_ieee(struct iwl_priv *priv, 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; tx_sta->status.ack_signal = 0;