diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-sta.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index a28a8decc79c..b9b8554433a6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -181,7 +181,7 @@ int iwl_send_add_sta(struct iwl_priv *priv, | |||
181 | EXPORT_SYMBOL(iwl_send_add_sta); | 181 | EXPORT_SYMBOL(iwl_send_add_sta); |
182 | 182 | ||
183 | static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index, | 183 | static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index, |
184 | struct ieee80211_ht_info *sta_ht_inf) | 184 | struct ieee80211_sta_ht_cap *sta_ht_inf) |
185 | { | 185 | { |
186 | __le32 sta_flags; | 186 | __le32 sta_flags; |
187 | u8 mimo_ps_mode; | 187 | u8 mimo_ps_mode; |
@@ -229,7 +229,7 @@ static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index, | |||
229 | * iwl_add_station_flags - Add station to tables in driver and device | 229 | * iwl_add_station_flags - Add station to tables in driver and device |
230 | */ | 230 | */ |
231 | u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr, int is_ap, | 231 | u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr, int is_ap, |
232 | u8 flags, struct ieee80211_ht_info *ht_info) | 232 | u8 flags, struct ieee80211_sta_ht_cap *ht_info) |
233 | { | 233 | { |
234 | int i; | 234 | int i; |
235 | int sta_id = IWL_INVALID_STATION; | 235 | int sta_id = IWL_INVALID_STATION; |
@@ -894,7 +894,7 @@ int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap) | |||
894 | 894 | ||
895 | /* Add station to device's station table */ | 895 | /* Add station to device's station table */ |
896 | struct ieee80211_conf *conf = &priv->hw->conf; | 896 | struct ieee80211_conf *conf = &priv->hw->conf; |
897 | struct ieee80211_ht_info *cur_ht_config = &conf->ht_conf; | 897 | struct ieee80211_sta_ht_cap *cur_ht_config = &conf->ht_cap; |
898 | 898 | ||
899 | if ((is_ap) && | 899 | if ((is_ap) && |
900 | (conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) && | 900 | (conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) && |