Re: [PATCH 1/2] wifi: mwifiex: simplify WPA flags setting
From: Sascha Hauer
Date: Wed Jul 17 2024 - 02:26:40 EST
On Tue, Jul 16, 2024 at 09:48:26PM +0200, Francesco Dolcini wrote:
> Hello Sasha,
> thanks for your patch.
>
> On Tue, Jul 16, 2024 at 01:33:27PM +0200, Sascha Hauer wrote:
> > The WPA flags setting only depends on the wpa_versions bitfield and not
> > on the AKM suite, so move it out of the switch/case to simplify the code
> > a bit. No functional change intended.
> >
> > Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
>
> Reviewed-by: Francesco Dolcini <francesco.dolcini@xxxxxxxxxxx>
>
> > ---
> > drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 27 +++++++-------------------
> > 1 file changed, 7 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
> > index 491e366119096..8d0cd84d27698 100644
> > --- a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
> > +++ b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
> > @@ -46,31 +46,18 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
> >
> > bss_config->key_mgmt_operation |= KEY_MGMT_ON_HOST;
> >
> > + if (params->crypto.wpa_versions & NL80211_WPA_VERSION_1)
> > + bss_config->protocol = PROTOCOL_WPA;
> > + if (params->crypto.wpa_versions & NL80211_WPA_VERSION_2)
> > + bss_config->protocol |= PROTOCOL_WPA2;
> > +
>
> I am wondering what happens if NL80211_WPA_VERSION_1 is not set, no idea
> what's the content of bss_config->protocol ...
>
> in any case this is not something that you introduced, but maybe worth
> having a look?
bss_config is kzalloced in the only caller of mwifiex_set_secure_params(),
so bss_config->protocol is zero on entry.
It might be worth setting it to zero explicitly here to make the code
better understandable without having to look at the callers.
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |