Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

30 files changed, 1231 insertions, 562 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 764dd9a6a072..1a89c80e6407 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1043,6 +1043,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
         list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
                 sta_info_flush_defer(vlan);
         sta_info_flush_defer(sdata);
+        synchronize_net();
         rcu_barrier();
         list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) {
                 sta_info_flush_cleanup(vlan);
@@ -1052,6 +1053,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
         ieee80211_free_keys(sdata);
 
         sdata->vif.bss_conf.enable_beacon = false;
+        sdata->vif.bss_conf.ssid_len = 0;
         clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);
         ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
 
@@ -2416,9 +2418,22 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,
         }
 
         for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
+                struct ieee80211_supported_band *sband = wiphy->bands[i];
+                int j;
+
                 sdata->rc_rateidx_mask[i] = mask->control[i].legacy;
                 memcpy(sdata->rc_rateidx_mcs_mask[i], mask->control[i].mcs,
                        sizeof(mask->control[i].mcs));
+
+                sdata->rc_has_mcs_mask[i] = false;
+                if (!sband)
+                        continue;
+
+                for (j = 0; j < IEEE80211_HT_MCS_MASK_LEN; j++)
+                        if (~sdata->rc_rateidx_mcs_mask[i][j]) {
+                                sdata->rc_has_mcs_mask[i] = true;
+                                break;
+                        }
         }
 
         return 0;
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 7d0baa89c784..03e8d2e3270e 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -57,6 +57,22 @@ ieee80211_find_chanctx(struct ieee80211_local *local,
         return NULL;
 }
 
+static bool ieee80211_is_radar_required(struct ieee80211_local *local)
+{
+        struct ieee80211_sub_if_data *sdata;
+
+        rcu_read_lock();
+        list_for_each_entry_rcu(sdata, &local->interfaces, list) {
+                if (sdata->radar_required) {
+                        rcu_read_unlock();
+                        return true;
+                }
+        }
+        rcu_read_unlock();
+
+        return false;
+}
+
 static struct ieee80211_chanctx *
 ieee80211_new_chanctx(struct ieee80211_local *local,
                       const struct cfg80211_chan_def *chandef,
@@ -76,6 +92,9 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
         ctx->conf.rx_chains_static = 1;
         ctx->conf.rx_chains_dynamic = 1;
         ctx->mode = mode;
+        ctx->conf.radar_enabled = ieee80211_is_radar_required(local);
+        if (!local->use_chanctx)
+                local->hw.conf.radar_enabled = ctx->conf.radar_enabled;
 
         /* acquire mutex to prevent idle from changing */
         mutex_lock(&local->mtx);
@@ -110,6 +129,7 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
 static void ieee80211_free_chanctx(struct ieee80211_local *local,
                                    struct ieee80211_chanctx *ctx)
 {
+        bool check_single_channel = false;
         lockdep_assert_held(&local->chanctx_mtx);
 
         WARN_ON_ONCE(ctx->refcount != 0);
@@ -119,6 +139,14 @@ static void ieee80211_free_chanctx(struct ieee80211_local *local,
                 chandef->width = NL80211_CHAN_WIDTH_20_NOHT;
                 chandef->center_freq1 = chandef->chan->center_freq;
                 chandef->center_freq2 = 0;
+
+                /* NOTE: Disabling radar is only valid here for
+                 * single channel context. To be sure, check it ...
+                 */
+                if (local->hw.conf.radar_enabled)
+                        check_single_channel = true;
+                local->hw.conf.radar_enabled = false;
+
                 ieee80211_hw_config(local, 0);
         } else {
                 drv_remove_chanctx(local, ctx);
@@ -127,6 +155,9 @@ static void ieee80211_free_chanctx(struct ieee80211_local *local,
         list_del_rcu(&ctx->list);
         kfree_rcu(ctx, rcu_head);
 
+        /* throw a warning if this wasn't the only channel context. */
+        WARN_ON(check_single_channel && !list_empty(&local->chanctx_list));
+
         mutex_lock(&local->mtx);
         ieee80211_recalc_idle(local);
         mutex_unlock(&local->mtx);
@@ -238,19 +269,11 @@ static void __ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata)
 void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,
                                     struct ieee80211_chanctx *chanctx)
 {
-        struct ieee80211_sub_if_data *sdata;
-        bool radar_enabled = false;
+        bool radar_enabled;
 
         lockdep_assert_held(&local->chanctx_mtx);
 
-        rcu_read_lock();
-        list_for_each_entry_rcu(sdata, &local->interfaces, list) {
-                if (sdata->radar_required) {
-                        radar_enabled = true;
-                        break;
+        radar_enabled = ieee80211_is_radar_required(local);