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

Conflicts:
	drivers/net/wireless/iwlwifi/mvm/mac80211.c

12 files changed, 108 insertions, 110 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 30622101d3b5..64cf294c2b96 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1759,6 +1759,7 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,
         /* mcast rate setting in Mesh Node */
         memcpy(sdata->vif.bss_conf.mcast_rate, setup->mcast_rate,
                                                 sizeof(setup->mcast_rate));
+        sdata->vif.bss_conf.basic_rates = setup->basic_rates;
 
         sdata->vif.bss_conf.beacon_int = setup->beacon_interval;
         sdata->vif.bss_conf.dtim_period = setup->dtim_period;
@@ -1871,6 +1872,8 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
         if (_chg_mesh_attr(NL80211_MESHCONF_AWAKE_WINDOW, mask))
                 conf->dot11MeshAwakeWindowDuration =
                         nconf->dot11MeshAwakeWindowDuration;
+        if (_chg_mesh_attr(NL80211_MESHCONF_PLINK_TIMEOUT, mask))
+                conf->plink_timeout = nconf->plink_timeout;
         ieee80211_mbss_info_change_notify(sdata, BSS_CHANGED_BEACON);
         return 0;
 }
@@ -2838,6 +2841,12 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
                 return -EOPNOTSUPP;
         }
 
+        /* configurations requiring offchan cannot work if no channel has been
+         * specified
+         */
+        if (need_offchan && !chan)
+                return -EINVAL;
+
         mutex_lock(&local->mtx);
 
         /* Check if the operating channel is the requested channel */
@@ -2847,10 +2856,15 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
                 rcu_read_lock();
                 chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
 
-                if (chanctx_conf)
-                        need_offchan = chan != chanctx_conf->def.chan;
-                else
+                if (chanctx_conf) {
+                        need_offchan = chan && (chan != chanctx_conf->def.chan);
+                } else if (!chan) {
+                        ret = -EINVAL;
+                        rcu_read_unlock();
+                        goto out_unlock;
+                } else {
                         need_offchan = true;
+                }
                 rcu_read_unlock();
         }
 
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 9eed6f1d1614..7a6f1a0207ec 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -366,7 +366,7 @@ struct ieee80211_mgd_assoc_data {
         u8 ssid_len;
         u8 supp_rates_len;
         bool wmm, uapsd;
-        bool have_beacon, need_beacon;
+        bool need_beacon;
         bool synced;
         bool timeout_started;
 
@@ -404,6 +404,7 @@ struct ieee80211_if_managed {
 
         bool powersave; /* powersave requested for this iface */
         bool broken_ap; /* AP is broken -- turn off powersave */
+        bool have_beacon;
         u8 dtim_period;
         enum ieee80211_smps_mode req_smps, /* requested smps mode */
                                  driver_smps_mode; /* smps mode request */
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 1998f1475267..626c83c042d7 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -686,8 +686,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
                 return -EINVAL;
 
 #ifdef CONFIG_PM
-        if ((hw->wiphy->wowlan.flags || hw->wiphy->wowlan.n_patterns) &&
-            (!local->ops->suspend || !local->ops->resume))
+        if (hw->wiphy->wowlan && (!local->ops->suspend || !local->ops->resume))
                 return -EINVAL;
 #endif
 
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index b3d1fdd46368..6c33af482df4 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -274,8 +274,7 @@ int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata,
         *pos++ = ifmsh->mesh_auth_id;
         /* Mesh Formation Info - number of neighbors */
         neighbors = atomic_read(&ifmsh->estab_plinks);
-        /* Number of neighbor mesh STAs or 15 whichever is smaller */
-        neighbors = (neighbors > 15) ? 15 : neighbors;
+        neighbors = min_t(int, neighbors, IEEE80211_MAX_MESH_PEERINGS);
         *pos++ = neighbors << 1;
         /* Mesh capability */
         *pos = IEEE80211_MESHCONF_CAPAB_FORWARDING;
@@ -576,13 +575,11 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata)
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
         u32 changed;
 
-        ieee80211_sta_expire(sdata, IEEE80211_MESH_PEER_INACTIVITY_LIMIT);
+        ieee80211_sta_expire(sdata, ifmsh->mshcfg.plink_timeout * HZ);
         mesh_path_expire(sdata);
 
         changed = mesh_accept_plinks_update(sdata);
-        sdata_lock(sdata);
         ieee80211_mbss_info_change_notify(sdata, changed);
-        sdata_unlock(sdata);
 
         mod_timer(&ifmsh->housekeeping_timer,
                   round_jiffies(jiffies +
@@ -741,9 +738,6 @@ int ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
                       BSS_CHANGED_HT |
                       BSS_CHANGED_BASIC_RATES |
                       BSS_CHANGED_BEACON_INT;
-        enum ieee80211_band band = ieee80211_get_sdata_band(sdata);
-        struct ieee80211_supported_band *sband =
-                                        sdata->local->hw.wiphy->bands[band];
 
         local->fif_other_bss++;
         /* mesh ifaces must set allmulti to forward mcast traffic */
@@ -761,7 +755,6 @@ int ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
         sdata->vif.bss_conf.ht_operation_mode =
                                 ifmsh->mshcfg.ht_opmode;
         sdata->vif.bss_conf.enable_beacon = true;
-        sdata->vif.bss_conf.basic_rates = ieee80211_mandatory_rates(sband);
 
         changed |= ieee80211_mps_local_status_update(sdata);
 
@@ -789,12 +782,10 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
         sdata->vif.bss_conf.enable_beacon = false;
         clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);
         ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
-        sdata_lock(sdata);
         bcn = rcu_dereference_protected(ifmsh->beacon,
                                         lockdep_is_held(&sdata->wdev.mtx));
         rcu_assign_pointer(ifmsh->beacon, NULL);
         kfree_rcu(bcn, rcu_head);
-        sdata_unlock(sdata);
 
         /* flush STAs and mpaths on this iface */
         sta_info_flush(sdata);
@@ -807,14 +798,6 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
         del_timer_sync(&sdata->u.mesh.housekeeping_timer);
         del_timer_sync(&sdata->u.mesh.mesh_path_root_timer);
         del_timer_sync(&sdata->u.mesh.mesh_path_timer);
-        /*
-         * If the timer fired while we waited for it, it will have
-         * requeued the work. Now the work will be running again
-         * but will not rearm the timer again because it checks
-         * whether the interface is running, which, at this point,
-         * it no longer is.
-         */
-        cancel_work_sync(&sdata->work);
 
         local->fif_other_bss--;
         atomic_dec(&local->iff_allmultis);
@@ -955,6 +938,12 @@ void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_mgmt *mgmt;
         u16 stype;
 
+        sdata_lock(sdata);
+
+        /* mesh already went down */
+        if (!sdata->wdev.mesh_id_len)
+                goto out;
+
         rx_status = IEEE80211_SKB_RXCB(skb);
         mgmt = (struct ieee80211_mgmt *) skb->data;
         stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
@@ -972,12 +961,20 @@ void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
                 ieee80211_mesh_rx_mgmt_action(sdata, mgmt, skb->len, rx_status);
                 break;
         }
+out:
+        sdata_unlock(sdata);
 }
 
 void ieee80211_mesh_work(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
 
+        sdata_lock(sdata);
+
+        /* mesh already went down */
+        if (!sdata->wdev.mesh_id_len)
+                goto out;
+
         if (ifmsh->preq_queue_len &&
             time_after(jiffies,
                        ifmsh->last_preq + msecs_to_jiffies(ifmsh->mshcfg.dot11MeshHWMPpreqMinInterval)))
@@ -997,6 +994,9 @@ void ieee80211_mesh_work(struct ieee80211_sub_if_data *sdata)
 
         if (test_and_clear_bit(MESH_WORK_DRIFT_ADJUST, &ifmsh->wrkq_flags))
                 mesh_sync_adjust_tbtt(sdata);
+
+out:
+        sdata_unlock(sdata);
 }
 
 void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local)
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index da158774eebb..01a28bca6e9b 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -188,7 +188,6 @@ struct mesh_rmc {
         u32 idx_mask;
 };
 
-#define IEEE80211_MESH_PEER_INACTIVITY_LIMIT (1800 * HZ)
 #define IEEE80211_MESH_HOUSEKEEPING_INTERVAL (60 * HZ)
 
 #define MESH_PATH_EXPIRE (600 * HZ)
@@ -324,14 +323,14 @@ static inline
 u32 mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata)
 {
         atomic_inc(&sdata->u.mesh.estab_plinks);
-        return mesh_accept_plinks_update(sdata);
+        return mesh_accept_plinks_update(sdata) | BSS_CHANGED_BEACON;
 }
 
 static inline
 u32 mesh_plink_dec_estab_count(struct ieee80211_sub_if_data *sdata)
 {
         atomic_dec(&sdata->u.mesh.estab_plinks);
-        return mesh_accept_plinks_update(sdata);
+        return mesh_accept_plinks_update(sdata) | BSS_CHANGED_BEACON;
 }
 
 static inline int mesh_plink_free_count(struct ieee80211_sub_if_data *sdata)
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 6c4da99bc4fb..09bebed99416 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -517,9 +517,7 @@ void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata,
         ieee80211_mps_frame_release(sta, elems);
 out:
         rcu_read_unlock();
-        sdata_lock(sdata);
         ieee80211_mbss_info_change_notify(sdata, changed);
-        sdata_unlock(sdata);
 }
 
 static void mesh_plink_timer(unsigned long data)
@@ -1070,9 +1068,6 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata,
 
         rcu_read_unlock();
 
-        if (changed) {
-                sdata_lock(sdata);
+        if (changed)
                 ieee80211_mbss_info_change_notify(sdata, changed);
-                sdata_unlock(sdata);
-        }
 }
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index f44f4caa69ee..ad9bb9e10cbb 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -880,6 +880,10 @@ void ieee80211_send_nullfunc(struct ieee80211_local *local,
 
         IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
                                         IEEE80211_TX_INTFL_OFFCHAN_TX_OK;
+
+        if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
+                IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS;
+
         if (ifmgd->flags & (IEEE80211_STA_BEACON_POLL |
                             IEEE80211_STA_CONNECTION_POLL))
                 IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_USE_MINRATE;
@@ -1356,7 +1360,7 @@ static bool ieee80211_powersave_allowed(struct ieee80211_sub_if_data *sdata)
                           IEEE80211_STA_CONNECTION_POLL))
                 return false;
 
-        if (!sdata->vif.bss_conf.dtim_period)
+        if (!mgd->have_beacon)
                 return false;
 
         rcu_read_lock();
@@ -1767,7 +1771,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
 
         ieee80211_led_assoc(local, 1);
 
-        if (sdata->u.mgd.assoc_data->have_beacon) {
+        if (sdata->u.mgd.have_beacon) {
                 /*
                  * If the AP is buggy we may get here with no DTIM period
                  * known, so assume it's 1 which is the only safe assumption
@@ -1775,7 +1779,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
                  * probably just won't work at all.
                  */
                 bss_conf->dtim_period = sdata->u.mgd.dtim_period ?: 1;
-                bss_info_changed |= BSS_CHANGED_DTIM_PERIOD;
+                bss_info_changed |= BSS_CHANGED_BEACON_INFO;
         } else {
                 bss_conf->dtim_period = 0;
         }
@@ -1899,6 +1903,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
         del_timer_sync(&sdata->u.mgd.chswitch_timer);
 
         sdata->vif.bss_conf.dtim_period = 0;
+        ifmgd->have_beacon = false;
 
         ifmgd->flags = 0;
         ieee80211_vif_release_channel(sdata);
@@ -2151,7 +2156,8 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)
                                         IEEE80211_MAX_QUEUE_MAP,
                                         IEEE80211_QUEUE_STOP_REASON_CSA);
 
-        cfg80211_send_deauth(sdata->dev, frame_buf, IEEE80211_DEAUTH_FRAME_LEN);
+        cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,
+                              IEEE80211_DEAUTH_FRAME_LEN);
         sdata_unlock(sdata);
 }
 
@@ -2298,7 +2304,7 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
                 sdata_info(sdata, "%pM denied authentication (status %d)\n",
                            mgmt->sa, status_code);
                 ieee80211_destroy_auth_data(sdata, false);
-                cfg80211_send_rx_auth(sdata->dev, (u8 *)mgmt, len);
+                cfg80211_rx_mlme_mgmt(sdata->dev, (u8 *)mgmt, len);
                 return;
         }
 
@@ -2333,7 +2339,7 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
                  * Report auth frame to user space for processing since another
                  * round of Authentication frames is still needed.
                  */
-                cfg80211_send_rx_auth(sdata->dev, (u8 *)mgmt, len);
+                cfg80211_rx_mlme_mgmt(sdata->dev, (u8 *)mgmt, len);
                 return;
         }
 
@@ -2350,7 +2356,7 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
         }
         mutex_unlock(&sdata->local->sta_mtx);
 
-        cfg80211_send_rx_auth(sdata->dev, (u8 *)mgmt, len);
+        cfg80211_rx_mlme_mgmt(sdata->dev, (u8 *)mgmt, len);
         return;
  out_err:
         mutex_unlock(&sdata->local->sta_mtx);
@@ -2383,7 +2389,7 @@ static void ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
 
         ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
 
-        cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, len);
+        cfg80211_rx_mlme_mgmt(sdata->dev, (u8 *)mgmt, len);
 }
 
 
@@ -2409,7 +2415,7 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
 
         ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
 
-        cfg80211_send_disassoc(sdata->dev, (u8 *)mgmt, len);
+        cfg80211_rx_mlme_mgmt(sdata->dev, (u8 *)mgmt, len);
 }
 
 static void ieee80211_get_rates(struct ieee80211_supported_band *sband,
@@ -2707,7 +2713,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
                         /* oops -- internal error -- send timeout for now */
                         ieee80211_destroy_assoc_data(sdata, false);
                         cfg80211_put_bss(sdata->local->hw.wiphy, bss);
-                        cfg80211_send_assoc_timeout(sdata->dev, mgmt->bssid);
+                        cfg80211_assoc_timeout(sdata->dev, mgmt->bssid);
                         return;
                 }
                 sdata_info(sdata, "associated\n");
@@ -2720,7 +2726,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
                 ieee80211_destroy_assoc_data(sdata, true);
         }
 
-        cfg80211_send_rx_assoc(sdata->dev, bss, (u8 *)mgmt, len);
+        cfg80211_rx_assoc_resp(sdata->dev, bss, (u8 *)mgmt, len);
 }
 
 static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
@@ -2732,24 +2738,9 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
         int freq;
         struct ieee80211_bss *bss;
         struct ieee80211_channel *channel;
-        bool need_ps = false;
 
         sdata_assert_lock(sdata);
 
-        if ((sdata->u.mgd.associated &&
-             ether_addr_equal(mgmt->bssid, sdata->u.mgd.associated->bssid)) ||
-            (sdata->u.mgd.assoc_data &&
-             ether_addr_equal(mgmt->bssid,
-                              sdata->u.mgd.assoc_data->bss->bssid))) {
-                /* not previously set so we may need to recalc */
-                need_ps = sdata->u.mgd.associated && !sdata->u.mgd.dtim_period;
-
-                if (elems->tim && !elems->parse_error) {
-                        const struct ieee80211_tim_ie *tim_ie = elems->tim;
-                        sdata->u.mgd.dtim_period = tim_ie->dtim_period;
-                }
-        }
-
         if (elems->ds_params)
                 freq = ieee80211_channel_to_frequency(elems->ds_params[0],
                                                       rx_status->band);
@@ -2770,12 +2761,6 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
             !ether_addr_equal(mgmt->bssid, sdata->u.mgd.associated->bssid))
                 return;
 
-        if (need_ps) {
-                mutex_lock(&local->iflist_mtx);
-                ieee80211_recalc_ps(local, -1);
-                mutex_unlock(&local->iflist_mtx);
-        }
-
         ieee80211_sta_process_chanswitch(sdata, rx_status->mactime,
                                          elems, true);
 
@@ -2889,7 +2874,11 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
                                        len - baselen, false, &elems);
 
                 ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems);
-                ifmgd->assoc_data->have_beacon = true;
+                if (elems.tim && !elems.parse_error) {
+                        const struct ieee80211_tim_ie *tim_ie = elems.tim;
+                        ifmgd->dtim_period = tim_ie->dtim_period;
+                }
+                ifmgd->have_beacon = true;
                 ifmgd->assoc_data->need_beacon = false;
                 if (local->hw.flags & IEEE80211_HW_TIMING_BEACON_ONLY) {
                         sdata->vif.bss_conf.sync_tsf =
@@ -3071,7 +3060,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
          * If we haven't had a beacon before, tell the driver about the
          * DTIM period (and beacon timing if desired) now.
          */
-        if (!bss_conf->dtim_period) {
+        if (!ifmgd->have_beacon) {
                 /* a few bogus AP send dtim_period = 0 or no TIM IE */
                 if (elems.tim)
                         bss_conf->dtim_period = elems.tim->dtim_period ?: 1;
@@ -3090,7 +3079,13 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
                                 sdata->vif.bss_conf.sync_dtim_count = 0;
                 }
 
-                changed |= BSS_CHANGED_DTIM_PERIOD;
+                changed |= BSS_CHANGED_BEACON_INFO;
+                ifmgd->have_beacon = true;
+
+                mutex_lock(&local->iflist_mtx);
+                ieee80211_recalc_ps(local, -1);
+                mutex_unlock(&local->iflist_mtx);
+
                 ieee80211_recalc_ps_vif(sdata);
         }
 
@@ -3113,8 +3108,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
                 ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
                                        WLAN_REASON_DEAUTH_LEAVING,
                                        true, deauth_buf);
-                cfg80211_send_deauth(sdata->dev, deauth_buf,
-                                     sizeof(deauth_buf));
+                cfg80211_tx_mlme_mgmt(sdata->dev, deauth_buf,
+                                      sizeof(deauth_buf));
                 return;
         }
 
@@ -3232,7 +3227,8 @@ static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata,
         ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason,
                                tx, frame_buf);
 
-        cfg80211_send_deauth(sdata->dev, frame_buf, IEEE80211_DEAUTH_FRAME_LEN);
+        cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,
+                              IEEE80211_DEAUTH_FRAME_LEN);
 }
 
 static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
@@ -3423,15 +3419,14 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
 
                         ieee80211_destroy_auth_data(sdata, false);
 
-                        cfg80211_send_auth_timeout(sdata->dev, bssid);
+                        cfg80211_auth_timeout(sdata->dev, bssid);
                 }
         } else if (ifmgd->auth_data && ifmgd->auth_data->timeout_started)
                 run_again(sdata, ifmgd->auth_data->timeout);
 
         if (ifmgd->assoc_data && ifmgd->assoc_data->timeout_started &&
             time_after(jiffies, ifmgd->assoc_data->timeout)) {
-                if ((ifmgd->assoc_data->need_beacon &&
-                     !ifmgd->assoc_data->have_beacon) ||
+                if ((ifmgd->assoc_data->need_beacon && !ifmgd->have_beacon) ||
                     ieee80211_do_assoc(sdata)) {
                         u8 bssid[ETH_ALEN];
 
@@ -3439,7 +3434,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
 
                         ieee80211_destroy_assoc_data(sdata, false);
 
-                        cfg80211_send_assoc_timeout(sdata->dev, bssid);
+                        cfg80211_assoc_timeout(sdata->dev, bssid);
                 }
         } else if (ifmgd->assoc_data && ifmgd->assoc_data->timeout_started)
                 run_again(sdata, ifmgd->assoc_data->timeout);
@@ -3988,8 +3983,8 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
                                        WLAN_REASON_UNSPECIFIED,
                                        false, frame_buf);
 
-                cfg80211_send_deauth(sdata->dev, frame_buf,
-                                     sizeof(frame_buf));
+                cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,
+                                      sizeof(frame_buf));
         }
 
         sdata_info(sdata, "authenticate with %pM\n", req->bss->bssid);
@@ -4051,8 +4046,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
                                        WLAN_REASON_UNSPECIFIED,
                                        false, frame_buf);
 
-                cfg80211_send_deauth(sdata->dev, frame_buf,
-                                     sizeof(frame_buf));
+                cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,
+                                      sizeof(frame_buf));
         }
 
         if (ifmgd->auth_data && !ifmgd->auth_data->done) {
@@ -4199,6 +4194,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
 
         ifmgd->assoc_data = assoc_data;
         ifmgd->dtim_period = 0;
+        ifmgd->have_beacon = false;
 
         err = ieee80211_prep_connection(sdata, req->bss, true);
         if (err)
@@ -4230,7 +4226,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
                         ifmgd->dtim_period = tim->dtim_period;
                         dtim_count = tim->dtim_count;
                 }
-                assoc_data->have_beacon = true;
+                ifmgd->have_beacon = true;
                 assoc_data->timeout = jiffies;
                 assoc_data->timeout_started = true;
 
@@ -4305,8 +4301,8 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
 
  out:
         if (report_frame)
-                cfg80211_send_deauth(sdata->dev, frame_buf,
-                                     IEEE80211_DEAUTH_FRAME_LEN);
+                cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,
+                                      IEEE80211_DEAUTH_FRAME_LEN);
 
         return 0;
 }
@@ -4336,8 +4332,8 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
                                req->reason_code, !req->local_state_change,
                                frame_buf);
 
-        cfg80211_send_disassoc(sdata->dev, frame_buf,
-                               IEEE80211_DEAUTH_FRAME_LEN);
+        cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,
+                              IEEE80211_DEAUTH_FRAME_LEN);
 
         return 0;
 }
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index bdd7b4a719e9..23dbcfc69b3b 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1747,27 +1747,21 @@ static int ieee80211_drop_unencrypted_mgmt(struct ieee80211_rx_data *rx)
                 if (unlikely(!ieee80211_has_protected(fc) &&
                              ieee80211_is_unicast_robust_mgmt_frame(rx->skb) &&
                              rx->key)) {
-                        if (ieee80211_is_deauth(fc))
-                                cfg80211_send_unprot_deauth(rx->sdata->dev,
-                                                            rx->skb->data,
-                                                            rx->skb->len);
-                        else if (ieee80211_is_disassoc(fc))
-                                cfg80211_send_unprot_disassoc(rx->sdata->dev,
-                                                              rx->skb->data,
-                                                              rx->skb->len);
+                        if (ieee80211_is_deauth(fc) ||
+                            ieee80211_is_disassoc(fc))
+                                cfg80211_rx_unprot_mlme_mgmt(rx->sdata->dev,
+                                                             rx->skb->data,
+                                                             rx->skb->len);
                         return -EACCES;
                 }
                 /* BIP does not use Protected field, so need to check MMIE */
                 if (unlikely(ieee80211_is_multicast_robust_mgmt_frame(rx->skb) &&
                              ieee80211_get_mmie_keyidx(rx->skb) < 0)) {
-                        if (ieee80211_is_deauth(fc))
-                                cfg80211_send_unprot_deauth(rx->sdata->dev,
-                                                            rx->skb->data,
-                                                            rx->skb->len);
-                        else if (ieee80211_is_disassoc(fc))
-                                cfg80211_send_unprot_disassoc(rx->sdata->dev,
-                                                              rx->skb->data,
-                                                              rx->skb->len);
+                        if (ieee80211_is_deauth(fc) ||
+                            ieee80211_is_disassoc(fc))
+                                cfg80211_rx_unprot_mlme_mgmt(rx->sdata->dev,
+                                                             rx->skb->data,
+                                                             rx->skb->len);
                         return -EACCES;
                 }
                 /*
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index a04c5671d7fd..b4297982d34a 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -1132,6 +1132,7 @@ static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata,
          * ends the poll/service period.
          */
         info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER |
+                       IEEE80211_TX_CTL_PS_RESPONSE |
                        IEEE80211_TX_STATUS_EOSP |
                        IEEE80211_TX_CTL_REQ_TX_STATUS;
 
@@ -1269,7 +1270,8 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
                          * STA may still remain is PS mode after this frame
                          * exchange.
                          */
-                        info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
+                        info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER |
+                                       IEEE80211_TX_CTL_PS_RESPONSE;
 
                         /*
                          * Use MoreData flag to indicate whether there are
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 41c28b977f7c..bd12fc54266c 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -297,6 +297,9 @@ struct sta_ampdu_mlme {
  * @rcu_head: RCU head used for freeing this station struct
  * @cur_max_bandwidth: maximum bandwidth to use for TX to the station,
  *      taken from HT/VHT capabilities or VHT operating mode notification
+ * @chains: chains ever used for RX from this station
+ * @chain_signal_last: last signal (per chain)
+ * @chain_signal_avg: signal average (per chain)
  */
 struct sta_info {
         /* General information, mostly static */
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 34be9336b5d1..4105d0ca963e 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1790,12 +1790,6 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
                 break;
 #ifdef CONFIG_MAC80211_MESH
         case NL80211_IFTYPE_MESH_POINT:
-                if (!sdata->u.mesh.mshcfg.dot11MeshTTL) {
-                        /* Do not send frames with mesh_ttl == 0 */
-                        sdata->u.mesh.mshstats.dropped_frames_ttl++;
-                        goto fail_rcu;
-                }
-
                 if (!is_multicast_ether_addr(skb->data)) {
                         struct sta_info *next_hop;
                         bool mpp_lookup = true;
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 89a83770d152..5a6c1351d1d3 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1584,8 +1584,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                                    BSS_CHANGED_ARP_FILTER |
                                    BSS_CHANGED_PS;
 
-                        if (sdata->u.mgd.dtim_period)
-                                changed |= BSS_CHANGED_DTIM_PERIOD;
+                        /* Re-send beacon info report to the driver */
+                        if (sdata->u.mgd.have_beacon)
+                                changed |= BSS_CHANGED_BEACON_INFO;
 
                         sdata_lock(sdata);
                         ieee80211_bss_info_change_notify(sdata, changed);