| Message ID | 20240717-mwifiex-wpa-psk-sha256-v2-1-eb53d5082b62@pengutronix.de (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | mwifiex: add support for WPA-PSK-SHA256 | expand |
On Wed, Jul 17, 2024 at 10:30:07AM +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. Also set bss_config->protocol to zero explicitly. This is done > only to make the code clearer, bss_config has been zero alloced by the > caller, so should be zero already. No functional change intended. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reviewed-by: Francesco Dolcini <francesco.dolcini@toradex.com>
On Wed, Jul 17, 2024 at 10:30:07AM +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. Also set bss_config->protocol to zero explicitly. This is done > only to make the code clearer, bss_config has been zero alloced by the > caller, so should be zero already. No functional change intended. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 28 ++++++++------------------ > 1 file changed, 8 insertions(+), 20 deletions(-) Acked-by: Brian Norris <briannorris@chromium.org>
diff --git a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c index 491e366119096..7f822660fd955 100644 --- a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c +++ b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c @@ -46,31 +46,19 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv, bss_config->key_mgmt_operation |= KEY_MGMT_ON_HOST; + bss_config->protocol = 0; + 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; + for (i = 0; i < params->crypto.n_akm_suites; i++) { switch (params->crypto.akm_suites[i]) { case WLAN_AKM_SUITE_8021X: - if (params->crypto.wpa_versions & - NL80211_WPA_VERSION_1) { - bss_config->protocol = PROTOCOL_WPA; - bss_config->key_mgmt = KEY_MGMT_EAP; - } - if (params->crypto.wpa_versions & - NL80211_WPA_VERSION_2) { - bss_config->protocol |= PROTOCOL_WPA2; - bss_config->key_mgmt = KEY_MGMT_EAP; - } + bss_config->key_mgmt = KEY_MGMT_EAP; break; case WLAN_AKM_SUITE_PSK: - if (params->crypto.wpa_versions & - NL80211_WPA_VERSION_1) { - bss_config->protocol = PROTOCOL_WPA; - bss_config->key_mgmt = KEY_MGMT_PSK; - } - if (params->crypto.wpa_versions & - NL80211_WPA_VERSION_2) { - bss_config->protocol |= PROTOCOL_WPA2; - bss_config->key_mgmt = KEY_MGMT_PSK; - } + bss_config->key_mgmt = KEY_MGMT_PSK; break; default: break;
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. Also set bss_config->protocol to zero explicitly. This is done only to make the code clearer, bss_config has been zero alloced by the caller, so should be zero already. No functional change intended. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 28 ++++++++------------------ 1 file changed, 8 insertions(+), 20 deletions(-)