summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKomal Seelam <kseelam@qti.qualcomm.com>2015-12-15 11:05:18 +0530
committerAkash Patel <akashp@codeaurora.org>2016-02-17 15:20:54 -0800
commit9f79df4afdcc688412582fafb9ddcefdaaa527c2 (patch)
treed98e272466dd7c9d50ec86ff8495e6f08ae05ea0
parentd7ff6aef93fe3e7f9865058a96f5867f3420f58a (diff)
qcacld-3.0: Fix Compilation error on WLAN_FEATURE_11W disabled
eCSR_AUTH_TYPE_RSN_8021X_SHA256 is defined only when 11W feature is enabled. The code is using the identifier eCSR_AUTH_TYPE_RSN_8021X_SHA256 without conditional compilation. Access eCSR_AUTH_TYPE_RSN_8021X_SHA256 under 11W feature flag. Change-Id: I5e1e513c12cf526045991749a487ac89d1773659 CRs-Fixed: 947938
-rw-r--r--core/hdd/src/wlan_hdd_assoc.c26
1 files changed, 23 insertions, 3 deletions
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index f21d96d2690e..7e211981946f 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -3821,6 +3821,27 @@ hdd_indicate_ese_bcn_report_ind(const hdd_adapter_t *pAdapter,
#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
/**
+ * hdd_is_8021x_sha256_auth_type() - check authentication type to 8021x_sha256
+ * @pHddStaCtx: Station Context
+ *
+ * API to check if the connection authentication type is 8021x_sha256.
+ *
+ * Return: bool
+ */
+#ifdef WLAN_FEATURE_11W
+static inline bool hdd_is_8021x_sha256_auth_type(hdd_station_ctx_t *pHddStaCtx)
+{
+ return eCSR_AUTH_TYPE_RSN_8021X_SHA256 ==
+ pHddStaCtx->conn_info.authType;
+}
+#else
+static inline bool hdd_is_8021x_sha256_auth_type(hdd_station_ctx_t *pHddStaCtx)
+{
+ return false;
+}
+#endif
+
+/**
* hdd_sme_roam_callback() - hdd sme roam callback
* @pContext: pointer to adapter context
* @pRoamInfo: pointer to roam info
@@ -4056,9 +4077,8 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
break;
#endif
case eCSR_ROAM_PMK_NOTIFY:
- if (eCSR_AUTH_TYPE_RSN == pHddStaCtx->conn_info.authType ||
- eCSR_AUTH_TYPE_RSN_8021X_SHA256 ==
- pHddStaCtx->conn_info.authType) {
+ if (eCSR_AUTH_TYPE_RSN == pHddStaCtx->conn_info.authType
+ || hdd_is_8021x_sha256_auth_type(pHddStaCtx)) {
/* notify the supplicant of a new candidate */
cdf_ret_status =
wlan_hdd_cfg80211_pmksa_candidate_notify(