aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/cfg80211.c
diff options
context:
space:
mode:
authorMarc Yang <yangyang@marvell.com>2011-03-28 20:55:42 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-04-04 16:20:04 -0400
commitf986b6d538c9351c99108b51be9f77ac1b300b16 (patch)
tree7a5a1afe3f07cd6aff200cacee138453c46c6df4 /drivers/net/wireless/mwifiex/cfg80211.c
parenteecd8250e492ffc4e7b72953cda9c2f3ba0e6ccc (diff)
mwifiex: remove MWIFIEX_AUTH_MODE_ macros
replace them with NL80211_AUTHTYPE_ macros 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>
Diffstat (limited to 'drivers/net/wireless/mwifiex/cfg80211.c')
-rw-r--r--drivers/net/wireless/mwifiex/cfg80211.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 701c17980f6d..2d9680044c12 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -600,7 +600,7 @@ mwifiex_cfg80211_change_virtual_intf(struct wiphy *wiphy,
600 600
601 mwifiex_deauthenticate(priv, wait, NULL); 601 mwifiex_deauthenticate(priv, wait, NULL);
602 602
603 priv->sec_info.authentication_mode = MWIFIEX_AUTH_MODE_OPEN; 603 priv->sec_info.authentication_mode = NL80211_AUTHTYPE_OPEN_SYSTEM;
604 604
605 ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_SET_BSS_MODE, 605 ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_SET_BSS_MODE,
606 HostCmd_ACT_GEN_SET, 0, wait, NULL); 606 HostCmd_ACT_GEN_SET, 0, wait, NULL);
@@ -1056,7 +1056,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
1056 priv->sec_info.encryption_mode = 1056 priv->sec_info.encryption_mode =
1057 MWIFIEX_ENCRYPTION_MODE_WEP104; 1057 MWIFIEX_ENCRYPTION_MODE_WEP104;
1058 priv->sec_info.authentication_mode = 1058 priv->sec_info.authentication_mode =
1059 MWIFIEX_AUTH_MODE_OPEN; 1059 NL80211_AUTHTYPE_OPEN_SYSTEM;
1060 } 1060 }
1061 1061
1062 goto done; 1062 goto done;
@@ -1065,9 +1065,9 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
1065 /* Now handle infra mode. "sme" is valid for infra mode only */ 1065 /* Now handle infra mode. "sme" is valid for infra mode only */
1066 if (sme->auth_type == NL80211_AUTHTYPE_AUTOMATIC 1066 if (sme->auth_type == NL80211_AUTHTYPE_AUTOMATIC
1067 || sme->auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM) 1067 || sme->auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM)
1068 auth_type = MWIFIEX_AUTH_MODE_OPEN; 1068 auth_type = NL80211_AUTHTYPE_OPEN_SYSTEM;
1069 else if (sme->auth_type == NL80211_AUTHTYPE_SHARED_KEY) 1069 else if (sme->auth_type == NL80211_AUTHTYPE_SHARED_KEY)
1070 auth_type = MWIFIEX_AUTH_MODE_SHARED; 1070 auth_type = NL80211_AUTHTYPE_SHARED_KEY;
1071 1071
1072 if (sme->crypto.n_ciphers_pairwise) { 1072 if (sme->crypto.n_ciphers_pairwise) {
1073 pairwise_encrypt_mode = mwifiex_get_mwifiex_cipher(sme->crypto. 1073 pairwise_encrypt_mode = mwifiex_get_mwifiex_cipher(sme->crypto.