Please ignore this one, I sent the wrong patch.
On 3/8/23 15:24, greearb@xxxxxxxxxxxxxxx wrote:
From: Ben Greear <greearb@xxxxxxxxxxxxxxx>
It was complaining about the 'DISABLE_HE' flag mismatch,
so ensure that if ifmgd has DISABLE_HE set, then 'flags'
also will have that flag set.
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
---
net/mac80211/mlme.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 0efca23be69b..52c8f2770757 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -505,6 +505,10 @@ static int ieee80211_config_bw(struct ieee80211_link_data *link,
chandef.width != NL80211_CHAN_WIDTH_80P80)
flags |= IEEE80211_CONN_DISABLE_80P80MHZ;
+ /* if ifmgd has HE disabled, then we cannot re-enable that here. */
+ if (link->u.mgd.conn_flags & IEEE80211_STA_DISABLE_HE)
+ flags |= IEEE80211_STA_DISABLE_HE;
+
if (cfg80211_chandef_identical(&chandef, &link->conf->chandef))
return 0;
--
Ben Greear <greearb@xxxxxxxxxxxxxxx>
Candela Technologies Inc http://www.candelatech.com
