mac80211: HE STA disassoc due to QOS NULL not sent

[linux.git] / net / mac80211 / mlme.c

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index a99ad032530946fd8c5d82cfd799ba598284e10d..e89ed800f01259be1f8c6549e935f39dcd44ac37 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2512,7 +2512,10 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)
 
        if (ieee80211_hw_check(&sdata->local->hw, REPORTS_TX_ACK_STATUS)) {
                ifmgd->nullfunc_failed = false;
-               ieee80211_send_nullfunc(sdata->local, sdata, false);
+               if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HE))
+                       ifmgd->probe_send_count--;
+               else
+                       ieee80211_send_nullfunc(sdata->local, sdata, false);
        } else {
                int ssid_len;
 
@@ -3381,6 +3384,8 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
                if (elems.uora_element)
                        bss_conf->uora_ocw_range = elems.uora_element[0];
 
+               ieee80211_he_op_ie_to_bss_conf(&sdata->vif, elems.he_operation);
+               ieee80211_he_spr_ie_to_bss_conf(&sdata->vif, elems.he_spr);
                /* TODO: OPEN: what happens if BSS color disable is set? */
        }