Received-SPF: pass (google.com: domain of linux-wireless+bounces-3340-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 8 Feb 2024 16:28:58 +0100
From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: greearb@candelatech.com, linux-wireless@vger.kernel.org
Subject: Re: [PATCH] mac80211:  Ensure bss-coloring is always configured
Message-ID: <ZcTzOm5dU9fPfYwC@lore-desk>
References: <20240130180848.776867-1-greearb@candelatech.com>
 <7c2721f79c1d6c0aa914db4f4d6148c8efce4b85.camel@sipsolutions.net>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="tHJlMJTTjpw18MCN"
Content-Disposition: inline
In-Reply-To: <7c2721f79c1d6c0aa914db4f4d6148c8efce4b85.camel@sipsolutions.net>


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

> On Tue, 2024-01-30 at 10:08 -0800, greearb@candelatech.com wrote:
> > From: Ben Greear <greearb@candelatech.com>
> >=20
> > Old code would not set it to disabled, just assumed that driver
> > would default to disabled.  Change this to explicitly request
> > bss color be flushed on initial driver configuration.
>=20
> Arguably, the current behaviour is in line with the documentation of
> BSS_CHANGED_HE_BSS_COLOR ... but I would tend to agree that
> enabling/disabling coloring should be covered by it as well. Lorenzo?
>=20
> > And I think the beacon-change logic was slightly wrong, so adjust
> > that as well.
>=20
> That's not a great thing for a commit message to say ...
>=20
> > Signed-off-by: Ben Greear <greearb@candelatech.com>
> > ---
> >  net/mac80211/cfg.c | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> >=20
> > diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
> > index 1c7fb0959cfd..1a6c6c764cbc 100644
> > --- a/net/mac80211/cfg.c
> > +++ b/net/mac80211/cfg.c
> > @@ -1331,8 +1331,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)
> > -			changed |=3D BSS_CHANGED_HE_BSS_COLOR;
> > +		changed |=3D BSS_CHANGED_HE_BSS_COLOR;

I think we should use beacon->he_bss_color_valid here instead of
params->beacon.he_bss_color.enabled, agree?

> >  	}
> > =20
> >  	if (params->he_cap) {
> > @@ -1512,6 +1511,7 @@ static int ieee80211_change_beacon(struct wiphy *=
wiphy, 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
> > @@ -1549,9 +1549,9 @@ static int ieee80211_change_beacon(struct wiphy *=
wiphy, struct net_device *dev,
> >  		return err;
> >  	changed |=3D 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_val=
id;
> > +	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;
> >  	}

this seems fine to me.

Regards,
Lorenzo

> >=20
>=20
> Not sure how this isn't updating the color itself, Lorenzo?
>=20
> johannes
>=20

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

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

iHUEABYKAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCZcTzOgAKCRA6cBh0uS2t
rLjwAP9XBppQXcumtFn6wYnPmAtxfQXKqD1CWIlHUUb3il+K+wD/XI4JGWzZhg5O
NePTC9lpXh7/Uahjgokq1UJ/WLDkqQI=
=WT5l
-----END PGP SIGNATURE-----

--tHJlMJTTjpw18MCN--