mac80211: introduce hw config change flags

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 855126a3039daa16ae64ca60c8087e0439a0d61f..8ea30902d5db1d26a797320ae82bb9c5ba737fa0 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -17,13 +17,6 @@
 #include "rate.h"
 #include "mesh.h"
 
-struct ieee80211_hw *wiphy_to_hw(struct wiphy *wiphy)
-{
-       struct ieee80211_local *local = wiphy_priv(wiphy);
-       return &local->hw;
-}
-EXPORT_SYMBOL(wiphy_to_hw);
-
 static bool nl80211_type_check(enum nl80211_iftype type)
 {
        switch (type) {
@@ -401,8 +394,8 @@ static int ieee80211_config_beacon(struct ieee80211_sub_if_data *sdata,
         */
        if (params->interval) {
                sdata->local->hw.conf.beacon_int = params->interval;
-               if (ieee80211_hw_config(sdata->local))
-                       return -EINVAL;
+               ieee80211_hw_config(sdata->local,
+                                   IEEE80211_CONF_CHANGE_BEACON_INTERVAL);
                /*
                 * We updated some parameter so if below bails out
                 * it's not an error.
@@ -641,10 +634,9 @@ static void sta_apply_parameters(struct ieee80211_local *local,
                sta->sta.supp_rates[local->oper_channel->band] = rates;
        }
 
-       if (params->ht_capa) {
-               ieee80211_ht_cap_ie_to_ht_info(params->ht_capa,
-                                              &sta->sta.ht_info);
-       }
+       if (params->ht_capa)
+               ieee80211_ht_cap_ie_to_sta_ht_cap(params->ht_capa,
+                                                 &sta->sta.ht_cap);
 
        if (ieee80211_vif_is_mesh(&sdata->vif) && params->plink_action) {
                switch (params->plink_action) {