diff options
| author | Deepak Dhamdhere <ddhamdhe@qca.qualcomm.com> | 2013-11-21 00:34:28 -0800 |
|---|---|---|
| committer | Prakash Dhavali <pdhavali@qca.qualcomm.com> | 2013-12-03 14:39:36 -0800 |
| commit | a2a44b35e60fbfab7f9bfb5846d60632d0258df0 (patch) | |
| tree | 8b0b70d2e4594a5ad5745972cbb708f343e6a1fe | |
| parent | c2e50797bc57d136e56340191b3cadc63f990e70 (diff) | |
qcacld: wma: Roaming auth and encryption type changes
Firmware now translates auth and encryption types from rsn_ie and
wpa_ie of beacons into WMI types for comparison in roaming.
Modified wma routines to send same WMI auth and encryption types
to firmware. Added separate WAPI_PSK, WPA_PSK and RSNA_PSK types.
Change-Id: I13d3b4d0e489ce9ad374c98a163d6a959011c6cb
CRs-Fixed: 578195
| -rw-r--r-- | CORE/SERVICES/WMA/wma.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index 2b13e9388161..40887eec2104 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -2849,26 +2849,31 @@ error: A_UINT32 eCsrAuthType_to_rsn_authmode (eCsrAuthType authtype) { switch(authtype) { case eCSR_AUTH_TYPE_OPEN_SYSTEM: - return (IEEE80211_AUTH_OPEN); + return (WMI_AUTH_OPEN); case eCSR_AUTH_TYPE_WPA: + return (WMI_AUTH_WPA); case eCSR_AUTH_TYPE_WPA_PSK: - return(IEEE80211_AUTH_WPA); + return (WMI_AUTH_WPA_PSK); case eCSR_AUTH_TYPE_RSN: + return (WMI_AUTH_RSNA); case eCSR_AUTH_TYPE_RSN_PSK: + return (WMI_AUTH_RSNA_PSK); #if defined WLAN_FEATURE_VOWIFI_11R case eCSR_AUTH_TYPE_FT_RSN: + return (WMI_AUTH_RSNA); case eCSR_AUTH_TYPE_FT_RSN_PSK: - return(IEEE80211_AUTH_RSNA); + return (WMI_AUTH_RSNA_PSK); #endif #ifdef FEATURE_WLAN_WAPI case eCSR_AUTH_TYPE_WAPI_WAI_CERTIFICATE: + return (WMI_AUTH_WAPI); case eCSR_AUTH_TYPE_WAPI_WAI_PSK: - return(IEEE80211_AUTH_WAPI); + return(WMI_AUTH_WAPI_PSK); #endif #ifdef FEATURE_WLAN_CCX case eCSR_AUTH_TYPE_CCKM_WPA: case eCSR_AUTH_TYPE_CCKM_RSN: - return(IEEE80211_AUTH_CCKM); + return(WMI_AUTH_CCKM); #endif default: return(WMI_AUTH_NONE); @@ -2888,19 +2893,20 @@ A_UINT32 eCsrEncryptionType_to_rsn_cipherset (eCsrEncryptionType encr) { case eCSR_ENCRYPT_TYPE_WEP104_STATICKEY: case eCSR_ENCRYPT_TYPE_WEP40: case eCSR_ENCRYPT_TYPE_WEP104: - return (IEEE80211_CIPHER_WEP); + return (WMI_CIPHER_WEP); case eCSR_ENCRYPT_TYPE_TKIP: - return (IEEE80211_CIPHER_TKIP); + return (WMI_CIPHER_TKIP); case eCSR_ENCRYPT_TYPE_AES: - return (IEEE80211_CIPHER_AES_CCM); + return (WMI_CIPHER_AES_CCM); #ifdef FEATURE_WLAN_WAPI case eCSR_ENCRYPT_TYPE_WPI: - return (IEEE80211_CIPHER_WAPI); + return (WMI_CIPHER_WAPI); #endif /* FEATURE_WLAN_WAPI */ case eCSR_ENCRYPT_TYPE_ANY: + return (WMI_CIPHER_ANY); case eCSR_ENCRYPT_TYPE_NONE: default: - return (IEEE80211_CIPHER_NONE); + return (WMI_CIPHER_NONE); } } |