Merge "qcacmn: Changes to support DPP AKM"

This commit is contained in:
Linux Build Service Account 2017-11-09 00:32:31 -08:00 • committed by Gerrit - the friendly Code Review server
commit 73c3e3fb26
3 changed files with 11 additions and 0 deletions

View file

@ -345,6 +345,7 @@ enum extn_element_ie {
#define WLAN_CCKM_ASE_UNSPEC 0
#define WLAN_WPA_CCKM_AKM 0x00964000
#define WLAN_RSN_CCKM_AKM 0x00964000
#define WLAN_RSN_DPP_AKM 0x029A6F50
#define RSN_VERSION 1
#define WLAN_RSN_SEL(x) (((x) << 24) | WLAN_RSN_OUI)

View file

@ -328,6 +328,7 @@ enum wlan_auth_type {
WLAN_AUTH_TYPE_FILS_SHA384,
WLAN_AUTH_TYPE_FT_FILS_SHA256,
WLAN_AUTH_TYPE_FT_FILS_SHA384,
WLAN_AUTH_TYPE_DPP_RSN,
WLAN_NUM_OF_SUPPORT_AUTH_TYPE,
};

View file

@ -577,6 +577,15 @@ static bool scm_is_rsn_security(struct scan_filter *filter,
break;
}
}
if (scm_is_cipher_match(rsn.akm_suites,
rsn.akm_suite_count, WLAN_RSN_DPP_AKM)) {
if (WLAN_AUTH_TYPE_DPP_RSN ==
filter->auth_type[i]) {
neg_auth = WLAN_AUTH_TYPE_DPP_RSN;
match = true;
break;
}
}
if (scm_is_cipher_match(rsn.akm_suites,
rsn.akm_suite_count,
WLAN_RSN_SEL(WLAN_AKM_FT_IEEE8021X))) {