diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index cf992240756a..ae18a803d034 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -118,7 +118,7 @@ struct iwl_queue { | |||
118 | #define MAX_NUM_OF_TBS (20) | 118 | #define MAX_NUM_OF_TBS (20) |
119 | 119 | ||
120 | /* One for each TFD */ | 120 | /* One for each TFD */ |
121 | struct iwl4965_tx_info { | 121 | struct iwl_tx_info { |
122 | struct ieee80211_tx_status status; | 122 | struct ieee80211_tx_status status; |
123 | struct sk_buff *skb[MAX_NUM_OF_TBS]; | 123 | struct sk_buff *skb[MAX_NUM_OF_TBS]; |
124 | }; | 124 | }; |
@@ -141,7 +141,7 @@ struct iwl_tx_queue { | |||
141 | struct iwl_tfd_frame *bd; | 141 | struct iwl_tfd_frame *bd; |
142 | struct iwl_cmd *cmd; | 142 | struct iwl_cmd *cmd; |
143 | dma_addr_t dma_addr_cmd; | 143 | dma_addr_t dma_addr_cmd; |
144 | struct iwl4965_tx_info *txb; | 144 | struct iwl_tx_info *txb; |
145 | int need_update; | 145 | int need_update; |
146 | int sched_retry; | 146 | int sched_retry; |
147 | int active; | 147 | int active; |
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 2e7e616a089d..6e70405d4416 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -1868,7 +1868,7 @@ static int iwl4965_tx_skb(struct iwl_priv *priv, | |||
1868 | idx = get_cmd_index(q, q->write_ptr, 0); | 1868 | idx = get_cmd_index(q, q->write_ptr, 0); |
1869 | 1869 | ||
1870 | /* Set up driver data for this TFD */ | 1870 | /* Set up driver data for this TFD */ |
1871 | memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl4965_tx_info)); | 1871 | memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info)); |
1872 | txq->txb[q->write_ptr].skb[0] = skb; | 1872 | txq->txb[q->write_ptr].skb[0] = skb; |
1873 | memcpy(&(txq->txb[q->write_ptr].status.control), | 1873 | memcpy(&(txq->txb[q->write_ptr].status.control), |
1874 | ctl, sizeof(struct ieee80211_tx_control)); | 1874 | ctl, sizeof(struct ieee80211_tx_control)); |
@@ -2306,7 +2306,7 @@ static int iwl4965_get_measurement(struct iwl_priv *priv, | |||
2306 | #endif | 2306 | #endif |
2307 | 2307 | ||
2308 | static void iwl4965_txstatus_to_ieee(struct iwl_priv *priv, | 2308 | static void iwl4965_txstatus_to_ieee(struct iwl_priv *priv, |
2309 | struct iwl4965_tx_info *tx_sta) | 2309 | struct iwl_tx_info *tx_sta) |
2310 | { | 2310 | { |
2311 | 2311 | ||
2312 | tx_sta->status.ack_signal = 0; | 2312 | tx_sta->status.ack_signal = 0; |