Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

4 files changed, 14 insertions, 3 deletions

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index bd1fd8ea5105..75b5dd2c9267 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -249,7 +249,7 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
 
         if (!local->use_chanctx) {
                 local->_oper_chandef = *chandef;
-                ieee80211_hw_config(local, 0);
+                ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
         } else {
                 err = drv_add_chanctx(local, ctx);
                 if (err) {
@@ -286,7 +286,7 @@ static void ieee80211_free_chanctx(struct ieee80211_local *local,
                         check_single_channel = true;
                 local->hw.conf.radar_enabled = false;
 
-                ieee80211_hw_config(local, 0);
+                ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
         } else {
                 drv_remove_chanctx(local, ctx);
         }
@@ -492,6 +492,13 @@ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,
                 rx_chains_static = max(rx_chains_static, needed_static);
                 rx_chains_dynamic = max(rx_chains_dynamic, needed_dynamic);
         }
+
+        /* Disable SMPS for the monitor interface */
+        sdata = rcu_dereference(local->monitor_sdata);
+        if (sdata &&
+            rcu_access_pointer(sdata->vif.chanctx_conf) == &chanctx->conf)
+                rx_chains_dynamic = rx_chains_static = local->rx_chains;
+
         rcu_read_unlock();
 
         if (!local->use_chanctx) {
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index b055f6a55c68..4c1bf61bc778 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -148,6 +148,8 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local)
         list_for_each_entry_rcu(sdata, &local->interfaces, list) {
                 if (!rcu_access_pointer(sdata->vif.chanctx_conf))
                         continue;
+                if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+                        continue;
                 power = min(power, sdata->vif.bss_conf.txpower);
         }
         rcu_read_unlock();
@@ -199,7 +201,7 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
 {
         struct ieee80211_local *local = sdata->local;
 
-        if (!changed)
+        if (!changed || sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
                 return;
 
         drv_bss_info_changed(local, sdata, &sdata->vif.bss_conf, changed);
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index 0c2a29484c07..6fb38558a5e6 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -355,6 +355,7 @@ void ieee80211_sw_roc_work(struct work_struct *work)
                 struct ieee80211_roc_work *dep;
 
                 /* start this ROC */
+                ieee80211_offchannel_stop_vifs(local);
 
                 /* switch channel etc */
                 ieee80211_recalc_idle(local);
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index e6e574a307c8..00ba90b02ab2 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -618,6 +618,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
                                         sta, true, acked);
 
                 if ((local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) &&
+                    (ieee80211_is_data(hdr->frame_control)) &&
                     (rates_idx != -1))
                         sta->last_tx_rate = info->status.rates[rates_idx];