summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDustin Brown <dustinb@codeaurora.org>2017-08-16 11:30:08 -0700
committersnandini <snandini@codeaurora.org>2017-08-29 17:02:07 -0700
commit4e8e11bc309ce0f5251de77420a402f0451f2c0b (patch)
treea5c1521a45e97ab4a3e04ed040efc019f0c577e0
parent8613cb92479b25a9a2e8ee16e1e4879aea1acba8 (diff)
qcacld-3.0: Avoid redefining WLAN_AKM_SUITE_FT_8021X
Linux kernel versions 4.12+ define WLAN_AKM_SUITE_FT_8021X. Avoid redefining WLAN_AKM_SUITE_FT_8021X when compiling against 4.12+ Linux kernels. Change-Id: Iaaaeb0c348933c69034cb852191bed4d6a6862b1 CRs-Fixed: 2093922
-rw-r--r--core/hdd/src/wlan_hdd_cfg80211.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 4359d4a96888..365b4d3ea8c7 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -147,7 +147,10 @@
#define CHAN_INFO_DELTA " dcc:%d drcc:%d dtfc:%d"
+#ifndef WLAN_AKM_SUITE_FT_8021X
#define WLAN_AKM_SUITE_FT_8021X 0x000FAC03
+#endif
+
#define WLAN_AKM_SUITE_FT_PSK 0x000FAC04
#define HDD_CHANNEL_14 14