Skip to contentSkip to conversation

mac80211: remove iwlwifi specific workaround NDPs of null_response

PATCH New Ping-Ke Shih 1 participant 2 messages Jun 23, 2021 mac80211

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mac80211: remove iwlwifi specific workaround NDPs of null_response

Remove the remaining workaround that is not removed by the
commit e41eb3e408de ("mac80211: remove iwlwifi specific workaround that broke sta NDP tx")

Fixes 41cbb0f5a295 ("mac80211: add support for HE")
---
 net/mac80211/sta_info.c | 5 -----
 1 file changed, 5 deletions(-)
net/mac80211/sta_info.c +0 -5
index 641a6657d0c9..e18c3855f616 100644
@@ -1398,11 +1398,6 @@ static void ieee80211_send_null_response(struct sta_info *sta, int tid,
 	struct ieee80211_tx_info *info;
 	struct ieee80211_chanctx_conf *chanctx_conf;
 
-	/* Don't send NDPs when STA is connected HE */
-	if (sdata->vif.type == NL80211_IFTYPE_STATION &&
-	    !(sdata->u.mgd.flags & IEEE80211_STA_DISABLE_HE))
-		return;
-
 	if (qos) {
 		fc = cpu_to_le16(IEEE80211_FTYPE_DATA |
 				 IEEE80211_STYPE_QOS_NULLFUNC |
Signature · 1 line
2.25.1
#1 lore raw

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

This reverts commit f39b07fdfb688724fedabf5507e15eaf398f2500.

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

---
 net/mac80211/mlme.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
net/mac80211/mlme.c +1 -4
index a0572ce99826..a00f11a33699 100644
@@ -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;
 
Signature · 1 line
2.25.1