diff options
| author | Vidyullatha Kanchanapally <vidyullatha@codeaurora.org> | 2017-04-18 14:14:06 +0530 |
|---|---|---|
| committer | Vidyullatha Kanchanapally <vidyullatha@codeaurora.org> | 2017-04-18 18:31:08 +0530 |
| commit | 31707f30cc2a425c69eece05f91552af54acc700 (patch) | |
| tree | fa57428472c49affb7779e8c6c093acdf95874ad | |
| parent | 3fc177aa54c14037fe951ce923dc0c6b2f0e4f46 (diff) | |
qcacld-2.0: Define AKM suites only if not present in kernel
qcacld-3.0 to qcacld-2.0 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: 2035051
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 2905958e89c6..bfd1e68eaf48 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -21922,8 +21922,12 @@ static int wlan_hdd_set_akm_suite( hdd_adapter_t *pAdapter, hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); /* 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) { |