diff mbox series

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

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

Commit Message

Ben Greear March 8, 2023, 11:24 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(+)

Comments

Ben Greear March 8, 2023, 11:37 p.m. UTC | #1 
Please ignore this one, I sent the wrong patch.

On 3/8/23 15:24, greearb@candelatech.com wrote:
> 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 --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;
>
diff mbox series

Patch

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;