diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 820542bac443..f7fd8ea61779 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -119,7 +119,6 @@ struct iwl_queue { | |||
119 | 119 | ||
120 | /* One for each TFD */ | 120 | /* One for each TFD */ |
121 | struct iwl_tx_info { | 121 | struct iwl_tx_info { |
122 | struct ieee80211_tx_status status; | ||
123 | struct sk_buff *skb[MAX_NUM_OF_TBS]; | 122 | struct sk_buff *skb[MAX_NUM_OF_TBS]; |
124 | }; | 123 | }; |
125 | 124 | ||
@@ -693,7 +692,7 @@ extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv, | |||
693 | struct iwl_frame *frame, u8 rate); | 692 | struct iwl_frame *frame, u8 rate); |
694 | extern void iwl4965_hw_build_tx_cmd_rate(struct iwl_priv *priv, | 693 | extern void iwl4965_hw_build_tx_cmd_rate(struct iwl_priv *priv, |
695 | struct iwl_cmd *cmd, | 694 | struct iwl_cmd *cmd, |
696 | struct ieee80211_tx_control *ctrl, | 695 | struct ieee80211_tx_info *info, |
697 | struct ieee80211_hdr *hdr, | 696 | struct ieee80211_hdr *hdr, |
698 | int sta_id, int tx_id); | 697 | int sta_id, int tx_id); |
699 | extern int iwl4965_hw_reg_send_txpower(struct iwl_priv *priv); | 698 | extern int iwl4965_hw_reg_send_txpower(struct iwl_priv *priv); |
@@ -749,7 +748,7 @@ extern void iwl4965_update_rate_scaling(struct iwl_priv *priv, u8 mode); | |||
749 | extern void iwl4965_rf_kill_ct_config(struct iwl_priv *priv); | 748 | extern void iwl4965_rf_kill_ct_config(struct iwl_priv *priv); |
750 | extern void iwl4965_hwrate_to_tx_control(struct iwl_priv *priv, | 749 | extern void iwl4965_hwrate_to_tx_control(struct iwl_priv *priv, |
751 | u32 rate_n_flags, | 750 | u32 rate_n_flags, |
752 | struct ieee80211_tx_control *control); | 751 | struct ieee80211_tx_info *info); |
753 | 752 | ||
754 | #ifdef CONFIG_IWL4965_HT | 753 | #ifdef CONFIG_IWL4965_HT |
755 | extern void iwl4965_init_ht_hw_capab(const struct iwl_priv *priv, | 754 | extern void iwl4965_init_ht_hw_capab(const struct iwl_priv *priv, |