From a0f242168c75d94dd24f6d9e9286ca6754a344d6 Mon Sep 17 00:00:00 2001
From: Abhishek Singh <absingh@codeaurora.org>
Date: Fri, 3 Nov 2017 14:47:59 +0530
Subject: [PATCH] qcacmn: Changes to support DPP AKM

Adds cmn changes to support and parse AKM required for DPP.

Change-Id: I8efd4075f2c62500dbe11c2a6847f2dab2f31b34
CRs-Fixed: 2138461
---
 umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h | 1 +
 umac/cmn_services/inc/wlan_cmn.h                    | 1 +
 umac/scan/core/src/wlan_scan_cache_db_ops.c         | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h b/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h
index c4da7a94f2aa..15d511eba9b1 100644
--- a/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h
+++ b/umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h
@@ -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)
diff --git a/umac/cmn_services/inc/wlan_cmn.h b/umac/cmn_services/inc/wlan_cmn.h
index c1eaa3bc6f35..f4b5c8f9162b 100644
--- a/umac/cmn_services/inc/wlan_cmn.h
+++ b/umac/cmn_services/inc/wlan_cmn.h
@@ -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,
 };
diff --git a/umac/scan/core/src/wlan_scan_cache_db_ops.c b/umac/scan/core/src/wlan_scan_cache_db_ops.c
index 2d4645232e31..01e7df5e6c50 100644
--- a/umac/scan/core/src/wlan_scan_cache_db_ops.c
+++ b/umac/scan/core/src/wlan_scan_cache_db_ops.c
@@ -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))) {