Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <162c20431069a5f81e93d36aec10fdad11f82aae.camel@sipsolutions.net>
Subject: Re: [PATCH] wifi: mac80211: fix EHT issue in
 ieee80211_determine_chantype
From:   Johannes Berg <johannes@sipsolutions.net>
To:     greearb@candelatech.com, linux-wireless@vger.kernel.org
Date:   Fri, 07 Oct 2022 14:46:56 +0200
In-Reply-To: <20220929151638.9823-1-greearb@candelatech.com>
References: <20220929151638.9823-1-greearb@candelatech.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4 (3.44.4-2.fc36) 
MIME-Version: 1.0
Precedence: bulk

On Thu, 2022-09-29 at 08:16 -0700, greearb@candelatech.com wrote:
> From: Ben Greear <greearb@candelatech.com>
>=20
> The IEEE80211_STA_DISABLE_EHT flag was not enabled when it should
> be, so the bandwidth change failed, and STA disconnected.
>=20
> Use an OR approach instead of just assinging the flags, to

typo - assigning

> allow easier setting of certain flags such as the EHT
> one.

This *looked* reasonable, but doesn't apply in any way? Can you rebase
on wireless/main please?

> Signed-off-by: Ben Greear <greearb@candelatech.com>
> ---
>  net/mac80211/mlme.c | 63 ++++++++++++++++++++++-----------------------
>  1 file changed, 31 insertions(+), 32 deletions(-)
>=20
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> index 011827137da7..9ac99f48c63b 100644
> --- a/net/mac80211/mlme.c
> +++ b/net/mac80211/mlme.c
> @@ -167,7 +167,8 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_=
data *sdata,
>  	struct ieee80211_if_managed *ifmgd =3D &sdata->u.mgd;
>  	struct cfg80211_chan_def vht_chandef;
>  	struct ieee80211_sta_ht_cap sta_ht_cap;
> -	u32 ht_cfreq, ret;
> +	u32 ht_cfreq;
> +	u32 ret =3D 0;

Could keep that on one line still? Any particular reason not to?
=20
> =20
>  	if (cfg80211_chandef_identical(chandef, &vht_chandef)) {
> -		ret =3D 0;
>  		goto out;
>  	}

can drop the braces now

johannes