From ed94c9349bf022ac5bf86dff4c9c8e2f02250933 Mon Sep 17 00:00:00 2001
From: bings <bings@codeaurora.org>
Date: Fri, 17 Apr 2020 15:28:22 +0800
Subject: [PATCH] qcacld-3.0: Fix WLAN_AKM_SUITE_* redefinition build error

Do not define WLAN_AKM_SUITE_OWE if it is defined.
Do not define WLAN_AKM_SUITE_EAP_SHA256 if it is defined.
Do not define WLAN_AKM_SUITE_EAP_SHA384 if it is defined.

Change-Id: Id06961a4c0d03f97279e2b45f9bfc5befb943e66
CRs-Fixed: 2666448
---
 core/hdd/src/wlan_hdd_cfg80211.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h
index 3a9122bb106e..b0b7bd1ec687 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.h
+++ b/core/hdd/src/wlan_hdd_cfg80211.h
@@ -159,10 +159,17 @@ extern const struct nla_policy wlan_hdd_wisa_cmd_policy[
 #define WLAN_AKM_SUITE_DPP_RSN 0x506f9a02
 #endif
 
+#ifndef WLAN_AKM_SUITE_OWE
 #define WLAN_AKM_SUITE_OWE 0x000FAC12
-#define WLAN_AKM_SUITE_EAP_SHA256 0x000FAC0B
-#define WLAN_AKM_SUITE_EAP_SHA384 0x000FAC0C
+#endif
 
+#ifndef WLAN_AKM_SUITE_EAP_SHA256
+#define WLAN_AKM_SUITE_EAP_SHA256 0x000FAC0B
+#endif
+
+#ifndef WLAN_AKM_SUITE_EAP_SHA384
+#define WLAN_AKM_SUITE_EAP_SHA384 0x000FAC0C
+#endif
 
 #ifndef WLAN_AKM_SUITE_SAE
 #define WLAN_AKM_SUITE_SAE 0x000FAC08