mwifiex: remove unnecessary _set_auth functions
mwifiex_set_encrypt_mode()
mwifiex_set_auth_mode()
mwifiex_set_auth()
These functions are confusing and misleading.
And they are really not needed at all.
Some unused definitions are also removed.
Signed-off-by: Marc Yang <yangyang@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 80f367f..84e33f1 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1055,11 +1055,10 @@
* scan. The cfg80211 does not give us the encryption
* mode at this stage so just setting it to WEP here.
*/
- wpa_enabled = 0;
- auth_type = MWIFIEX_AUTH_MODE_OPEN;
- ret = mwifiex_set_auth(priv,
- MWIFIEX_ENCRYPTION_MODE_WEP104,
- auth_type, wpa_enabled);
+ priv->sec_info.encryption_mode =
+ MWIFIEX_ENCRYPTION_MODE_WEP104;
+ priv->sec_info.authentication_mode =
+ MWIFIEX_AUTH_MODE_OPEN;
}
goto done;
@@ -1075,15 +1074,15 @@
if (sme->crypto.n_ciphers_pairwise) {
pairwise_encrypt_mode = mwifiex_get_mwifiex_cipher(sme->crypto.
ciphers_pairwise[0], &wpa_enabled);
- ret = mwifiex_set_auth(priv, pairwise_encrypt_mode, auth_type,
- wpa_enabled);
+ priv->sec_info.encryption_mode = pairwise_encrypt_mode;
+ priv->sec_info.authentication_mode = auth_type;
}
if (sme->crypto.cipher_group) {
group_encrypt_mode = mwifiex_get_mwifiex_cipher(sme->crypto.
cipher_group, &wpa_enabled);
- ret = mwifiex_set_auth(priv, group_encrypt_mode, auth_type,
- wpa_enabled);
+ priv->sec_info.encryption_mode = group_encrypt_mode;
+ priv->sec_info.authentication_mode = auth_type;
}
if (sme->ie)
ret = mwifiex_set_gen_ie(priv, sme->ie, sme->ie_len);