Explorar el Código

qcacld-3.0: Fix compilation issues on disabling LFR3.0 roaming

Fix various compilation issues coming when LFR3.0 is
disabled by undefining WLAN_FEATURE_ROAM_OFFLOAD macro
in Kbuild.

Change-Id: Id483dc9fcc57d359f13b385dd655e34c1823a77f
CRs-fixed: 1071087
Himanshu Agarwal hace 8 años
padre
commit
b4823b570c

+ 5 - 0
core/hdd/inc/wlan_hdd_assoc.h

@@ -346,6 +346,11 @@ QDF_STATUS hdd_roam_deregister_sta(hdd_adapter_t *adapter, uint8_t sta_id);
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 void hdd_wma_send_fastreassoc_cmd(int session_id, const tSirMacAddr bssid,
 				  int channel);
+#else
+static inline void hdd_wma_send_fastreassoc_cmd(int sessionId,
+		const tSirMacAddr bssid, int channel)
+{
+}
 #endif
 
 #endif

+ 0 - 6
core/hdd/src/wlan_hdd_ioctl.c

@@ -870,12 +870,6 @@ void hdd_wma_send_fastreassoc_cmd(int sessionId, const tSirMacAddr bssid,
 		hdd_err("Not able to post ROAM_INVOKE_CMD message to WMA");
 	}
 }
-#else
-void hdd_wma_send_fastreassoc_cmd(int sessionId, const tSirMacAddr bssid,
-				  int channel)
-{
-}
-
 #endif
 
 /**

+ 0 - 2
core/wma/inc/wma.h

@@ -1576,7 +1576,6 @@ typedef struct {
 	 * the serialized MC thread context with a timer.
 	 */
 	qdf_mc_timer_t service_ready_ext_timer;
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
 	void (*csr_roam_synch_cb)(tpAniSirGlobal mac,
 		roam_offload_synch_ind *roam_synch_data,
 		tpSirBssDescription  bss_desc_ptr,
@@ -1584,7 +1583,6 @@ typedef struct {
 	QDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac,
 		roam_offload_synch_ind *roam_synch_data,
 		tpSirBssDescription  bss_desc_ptr);
-#endif
 	qdf_wake_lock_t wmi_cmd_rsp_wake_lock;
 	qdf_runtime_lock_t wmi_cmd_rsp_runtime_lock;
 	qdf_runtime_lock_t wma_runtime_resume_lock;

+ 1 - 1
core/wma/inc/wma_types.h

@@ -709,8 +709,8 @@ QDF_STATUS wma_register_mgmt_frm_client(void *p_cds_gctx,
 				wma_mgmt_frame_rx_callback mgmt_rx_cb);
 
 QDF_STATUS wma_de_register_mgmt_frm_client(void *p_cds_gctx);
-QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx,
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
+QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx,
 		void (*csr_roam_synch_cb)(tpAniSirGlobal mac,
 			roam_offload_synch_ind *roam_synch_data,
 			tpSirBssDescription  bss_desc_ptr,