Received-SPF: pass (google.com: domain of linux-wireless+bounces-4871-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Mon, 18 Mar 2024 23:48:45 +0100
From: Lorenzo Bianconi <lorenzo@kernel.org>
To: greearb@candelatech.com
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH] wifi: mac80211:  Improve bss-color configuration.
Message-ID: <ZfjEzYQbWDZeae8Z@lore-desk>
References: <20240307181039.3219840-1-greearb@candelatech.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="Qcoec7Ums99D/eSa"
Content-Disposition: inline
In-Reply-To: <20240307181039.3219840-1-greearb@candelatech.com>


--Qcoec7Ums99D/eSa
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

> From: Ben Greear <greearb@candelatech.com>
>=20
> Always tell driver to apply bss color settings if beacon indicates
> the bss coloring has been set.
>=20
> And only enable bss coloring if beacon indicates bss color setting
> is valid and also enabled.
>=20
> Signed-off-by: Ben Greear <greearb@candelatech.com>
> ---
>  net/mac80211/cfg.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>=20
> diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
> index 327682995c92..aaa62c05428c 100644
> --- a/net/mac80211/cfg.c
> +++ b/net/mac80211/cfg.c
> @@ -1314,7 +1314,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, =
struct net_device *dev,
>  			      IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK);
>  		changed |=3D BSS_CHANGED_HE_OBSS_PD;
> =20
> -		if (params->beacon.he_bss_color.enabled)
> +		if (params->beacon.he_bss_color_valid)
>  			changed |=3D BSS_CHANGED_HE_BSS_COLOR;

This change seems correct to me since he_bss_color_valid is set to true whe=
n userspace
(e.g. hostapd) provides the bss color info.

>  	}
> =20
> @@ -1494,6 +1494,7 @@ static int ieee80211_change_beacon(struct wiphy *wi=
phy, struct net_device *dev,
>  	int err;
>  	struct ieee80211_bss_conf *link_conf;
>  	u64 changed =3D 0;
> +	bool color_en;
> =20
>  	lockdep_assert_wiphy(wiphy);
> =20
> @@ -1530,9 +1531,9 @@ static int ieee80211_change_beacon(struct wiphy *wi=
phy, struct net_device *dev,
>  	if (err < 0)
>  		return err;
> =20
> -	if (beacon->he_bss_color_valid &&
> -	    beacon->he_bss_color.enabled !=3D link_conf->he_bss_color.enabled) {
> -		link_conf->he_bss_color.enabled =3D beacon->he_bss_color.enabled;
> +	color_en =3D beacon->he_bss_color.enabled && beacon->he_bss_color_valid;
> +	if (color_en !=3D link_conf->he_bss_color.enabled) {
> +		link_conf->he_bss_color.enabled =3D color_en;
>  		changed |=3D BSS_CHANGED_HE_BSS_COLOR;
>  	}

Here both approaches seem fine to me (but I do not have a strong opinion).
The one proposed by Ben disables by default bss coloring if color is not
valid.

Regards,
Lorenzo

> =20
> --=20
> 2.42.0
>=20
>=20

--Qcoec7Ums99D/eSa
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCZfjEzQAKCRA6cBh0uS2t
rN9+AP9dJNW9bQ1LADzanMadesuDvJbUOJD6Fc7g5zY593YwkQEA5AaTmtTQN6y6
KPmHnP1Nj+7JcuEPKo19OVt6IBbV4gc=
=lW/f
-----END PGP SIGNATURE-----

--Qcoec7Ums99D/eSa--