commit 0819768fd8c170749f8e80a8c16244be5f536f3e
author Vidyullatha Kanchanapally <vidyullatha@codeaurora.org> Tue Apr 18 16:30:11 2017 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 24 04:04:25 2017 -0700
tree ffdf9700fbaf57a7b1d8dc3106e62a0b89c2ef39
parent 4ff0b80afc929af946a4785f5a860572294a8a95

wlan: Define AKM suites only if not present in kernel

qcacld-3.0 to prima propagation

Define AKM suites WLAN_AKM_SUITE_8021X_SHA256 and
WLAN_AKM_SUITE_PSK_SHA256 only if not defined in kernel header in order
to avoid compilation issues because of a previous definition.

Change-Id: I779a9991763797541fc142e980f717a48fe3bd26
CRs-Fixed: 2033185

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index c0b44de..9cf3b86 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -14745,8 +14745,12 @@
     hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
     ENTER();
     /* Should be in ieee802_11_defs.h */
+#ifndef WLAN_AKM_SUITE_8021X_SHA256
 #define WLAN_AKM_SUITE_8021X_SHA256 0x000FAC05
+#endif
+#ifndef WLAN_AKM_SUITE_PSK_SHA256
 #define WLAN_AKM_SUITE_PSK_SHA256   0x000FAC06
+#endif
     /*set key mgmt type*/
     switch(key_mgmt)
     {