Thread (2 messages) flat view 2 messages, 1 author, 2021-06-23
DORMANTno replies LANDED

Landed in mainline as 2832943c789a on 2021-06-23.

[PATCH 2/2] Revert "mac80211: HE STA disassoc due to QOS NULL not sent"

From: Ping-Ke Shih <pkshih@realtek.com>
Date: 2021-06-23 13:48:42
Subsystem: mac80211, the rest · Maintainers: Johannes Berg, Linus Torvalds

This reverts commit f39b07fdfb688724fedabf5507e15eaf398f2500.

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>
---
 net/mac80211/mlme.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index a0572ce99826..a00f11a33699 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -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;
 
-- 
2.25.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help