wifi: mwifiex: fix key_mgmt setting

bss_config->key_mgmt specifies the AKM suites that are usable in
hardware. This variable is set to specific values while iterating
over the advertised AKM suites. This means the final value of the
variable depends on the order of the entries in the AKM suites
array. Instead of setting the variable, just set the relevant bits
in the key_mgmt bit field to make us independent of the order of
entries.
This behaviour is derived from the downstream driver that does the
same.
Also, set bss_config->key_mgmt to zero explicitly right before the
loop. bss_config has been zero allocated by the caller already, but
do so again to save the reader from following the code path.

Reviewed-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Acked-by: Brian Norris <briannorris@chromium.org>
Link: https://lore.kernel.org/r/20240723-mwifiex-wpa-psk-sha256-v3-2-025168a91da1@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20240805-mwifiex-wpa-psk-sha256-v4-2-e1eee80508e6@pengutronix.de

diff --git a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
index 51fcae8726ed0d9e5e2393541620dea4ba4703a4..7214b6cf304a95ab91eb776ed527e561abf40eb9 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
@@ -52,16 +52,17 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
        if (params->crypto.wpa_versions & NL80211_WPA_VERSION_2)
                bss_config->protocol |= PROTOCOL_WPA2;
 
+       bss_config->key_mgmt = 0;
        for (i = 0; i < params->crypto.n_akm_suites; i++) {
                switch (params->crypto.akm_suites[i]) {
                case WLAN_AKM_SUITE_8021X:
-                       bss_config->key_mgmt = KEY_MGMT_EAP;
+                       bss_config->key_mgmt |= KEY_MGMT_EAP;
                        break;
                case WLAN_AKM_SUITE_PSK:
-                       bss_config->key_mgmt = KEY_MGMT_PSK;
+                       bss_config->key_mgmt |= KEY_MGMT_PSK;
                        break;
                case WLAN_AKM_SUITE_SAE:
-                       bss_config->key_mgmt = KEY_MGMT_SAE;
+                       bss_config->key_mgmt |= KEY_MGMT_SAE;
                        break;
                default:
                        break;