From 0b0fa277ca4b1b6dee198d3374ebffed7911598c Mon Sep 17 00:00:00 2001
From: Vignesh Viswanathan <viswanat@codeaurora.org>
Date: Mon, 18 Sep 2017 17:12:04 +0530
Subject: [PATCH] qcacld-3.0: Fix Compilation issues when FILS is disabled in
 Kbuild

Currently with CONFIG_WLAN_FEATURE_FILS set to n in Kbuild,
compilation issues are seen in the function hdd_save_gtk_params
due to usage of fils related structure without the compilation flag
checked.

Add new definition for the function hdd_save_gtk_params to fix
compilation issues with hdd_save_gtk_params set to n

Change-Id: Iab96c97df50f50c601ba52060440668373f74744
CRs-Fixed: 2111640
---
 core/hdd/src/wlan_hdd_assoc.c | 21 +++++++++++++++++++++
 core/mac/inc/sir_api.h        |  2 +-
 core/sme/inc/csr_api.h        |  2 --
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index a72f7bc43c52..518bc84efef1 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -2053,6 +2053,7 @@ static inline void hdd_send_roamed_ind(struct net_device *dev,
 #endif
 
 #if defined(WLAN_FEATURE_ROAM_OFFLOAD)
+#if defined(WLAN_FEATURE_FILS_SK)
 void hdd_save_gtk_params(struct hdd_adapter *adapter,
 			 tCsrRoamInfo *csr_roam_info, bool is_reassoc)
 {
@@ -2077,6 +2078,26 @@ void hdd_save_gtk_params(struct hdd_adapter *adapter,
 
 	hdd_debug("Kek len %d", kek_len);
 }
+#else
+void hdd_save_gtk_params(struct hdd_adapter *adapter,
+			 tCsrRoamInfo *csr_roam_info, bool is_reassoc)
+{
+	uint8_t *kek;
+	uint32_t kek_len;
+
+	/*
+	 * is_reassoc is set to true always for Legacy GTK offload
+	 * case, It is false only for FILS case
+	 */
+	kek = csr_roam_info->kek;
+	kek_len = csr_roam_info->kek_len;
+
+	wlan_hdd_save_gtk_offload_params(adapter, NULL, kek, kek_len,
+					 csr_roam_info->replay_ctr, true);
+
+	hdd_debug("Kek len %d", kek_len);
+}
+#endif
 #endif
 /**
  * hdd_send_re_assoc_event() - send reassoc event
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 6e4baefe32e1..9622df86a38b 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -1320,8 +1320,8 @@ typedef struct sSirSmeJoinRsp {
 	tDot11fIEVHTOperation vht_operation;
 	tDot11fIEhs20vendor_ie hs20vendor_ie;
 	bool is_fils_connection;
-#ifdef WLAN_FEATURE_FILS_SK
 	uint16_t fils_seq_num;
+#ifdef WLAN_FEATURE_FILS_SK
 	struct fils_join_rsp_params *fils_join_rsp;
 #endif
 	uint8_t frames[1];
diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h
index 96e845df9e5c..088ff989cc3e 100644
--- a/core/sme/inc/csr_api.h
+++ b/core/sme/inc/csr_api.h
@@ -409,10 +409,8 @@ typedef struct tagCsrScanResultFilter {
 	struct sCsrChannel_ pcl_channels;
 	struct qdf_mac_addr bssid_hint;
 	enum tQDF_ADAPTER_MODE csrPersona;
-#ifdef WLAN_FEATURE_FILS_SK
 	bool realm_check;
 	uint8_t fils_realm[2];
-#endif
 } tCsrScanResultFilter;
 
 typedef struct sCsrChnPower_ {