Revert "mac80211: HE STA disassoc due to QOS NULL not sent"
authorPing-Ke Shih <pkshih@realtek.com>
Wed, 23 Jun 2021 13:48:26 +0000 (21:48 +0800)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 23 Jun 2021 16:11:21 +0000 (18:11 +0200)
This reverts commit f39b07fdfb68 ("mac80211: HE STA disassoc
due to QOS NULL not sent")

Since iwlwifi specific workaround, which blocks to send NDP,
is removed, we can revert this commit.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://lore.kernel.org/r/20210623134826.10318-2-pkshih@realtek.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mlme.c

index a0572ce99826b96f2daf6fbbab4c6f52fb7fdd05..a00f11a33699bb506c4129a68c15f2726db78650 100644 (file)
@@ -2541,10 +2541,7 @@ 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;
-               if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HE))
-                       ifmgd->probe_send_count--;
-               else
-                       ieee80211_send_nullfunc(sdata->local, sdata, false);
+               ieee80211_send_nullfunc(sdata->local, sdata, false);
        } else {
                int ssid_len;