From: Muna Sinada <quic_msinada@quicinc.com>
Date: Wed, 23 Mar 2022 22:46:36 +0000 (-0700)
Subject: mac80211: support disabling EHT mode
X-Git-Tag: v5.19-rc1~159^2~59^2~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ca980168669acc361e3e3e984f23e20d8bf99f9;p=thirdparty%2Fkernel%2Flinux.git

mac80211: support disabling EHT mode

Allow userspace to disable EHT mode.
This forces EHT capable interfaces to disable during association.

Signed-off-by: Muna Sinada <quic_msinada@quicinc.com>
Signed-off-by: Aloka Dixit <quic_alokad@quicinc.com>
Link: https://lore.kernel.org/r/20220323224636.20211-2-quic_alokad@quicinc.com
[remove stray message change]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index b857915881e09..f02137b4cb12e 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -6126,6 +6126,9 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
 		ifmgd->flags |= IEEE80211_STA_DISABLE_EHT;
 	}
 
+	if (req->flags & ASSOC_REQ_DISABLE_EHT)
+		ifmgd->flags |= IEEE80211_STA_DISABLE_EHT;
+
 	err = ieee80211_prep_connection(sdata, req->bss, true, override);
 	if (err)
 		goto err_clear;