diff mbox series

[v2,2/2] wireless: mac80211: fix ath10k wave-2 in 80mhz mode in config_bw logic.

Message ID 20230308234158.2732682-2-greearb@candelatech.com (mailing list archive)
State Rejected
Delegated to: Johannes Berg
Headers show
Series [v2,1/2] wireless: mac80211: Relax flags check in bw-change logic. | expand

Commit Message

Ben Greear March 8, 2023, 11:41 p.m. UTC 
From: Ben Greear <greearb@candelatech.com>

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@candelatech.com>
---
 net/mac80211/mlme.c | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox series

Patch

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 0efca23be69b..827d61c2dd1b 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_CONN_DISABLE_HE)
+		flags |= IEEE80211_CONN_DISABLE_HE;
+
 	if (cfg80211_chandef_identical(&chandef, &link->conf->chandef))
 		return 0;