qcacld-3.0: Fix TDLS featurization build failure

When CONFIG_MOBILE_ROUTER is enabled there are build failures
due to improper featurization of TDLS, so fix the featurization
build failures.

Change-Id: I0e6b21615e763f2c4c86e0092807062cc8397705
CRs-Fixed: 2355801

core/hdd/inc/wlan_hdd_tdls.h

@@ -257,6 +257,14 @@ QDF_STATUS hdd_tdls_register_peer(void *userdata, uint32_t vdev_id,
 QDF_STATUS hdd_tdls_deregister_peer(void *userdata, uint32_t vdev_id,
 				    uint8_t sta_id);
 
+/**
+ * hdd_init_tdls_config() - initialize tdls config
+ * @tdls_cfg: pointer to tdls_start_params structure
+ *
+ * Return: none
+ */
+void hdd_init_tdls_config(struct tdls_start_params *tdls_cfg);
+
 #else
 
 static inline int wlan_hdd_tdls_antenna_switch(struct hdd_context *hdd_ctx,
@@ -283,14 +291,21 @@ hdd_tdls_notify_p2p_roc(struct hdd_context *hdd_ctx,
 static inline
 QDF_STATUS hdd_tdls_register_peer(void *userdata, uint32_t vdev_id,
 				  const uint8_t *mac, uint16_t sta_id,
-				  uint8_t qos);
+				  uint8_t qos)
 {
+	return QDF_STATUS_SUCCESS;
 }
 
 static inline
 QDF_STATUS hdd_tdls_deregister_peer(void *userdata, uint32_t vdev_id,
 				    uint8_t sta_id)
 {
+	return QDF_STATUS_SUCCESS;
 }
+
+static inline void hdd_init_tdls_config(struct tdls_start_params *tdls_cfg)
+{
+}
+
 #endif /* End of FEATURE_WLAN_TDLS */
 #endif /* __HDD_TDLS_H */

core/hdd/src/wlan_hdd_assoc.c

@@ -1399,11 +1399,14 @@ static void hdd_send_association_event(struct net_device *dev,
 						pCsrRoamInfo->timingMeasCap,
 						adapter->session_id, &chan_info,
 						adapter->device_mode);
+
+#ifdef FEATURE_WLAN_TDLS
 		/* Update tdls module about connection event */
 		hdd_notify_sta_connect(adapter->session_id,
 				       pCsrRoamInfo->tdls_chan_swit_prohibited,
 				       pCsrRoamInfo->tdls_prohibited,
 				       adapter->vdev);
+#endif
 
 #ifdef MSM_PLATFORM
 		/* start timer in sta/p2p_cli */

core/hdd/src/wlan_hdd_cfg80211.c

@@ -827,7 +827,27 @@ wlan_hdd_cfg80211_get_tdls_capabilities(struct wiphy *wiphy,
 
 	return ret;
 }
-#endif
+
+static uint8_t hdd_get_bw_offset(uint32_t ch_width)
+{
+	uint8_t bw_offset = 0;
+
+	if (ch_width == CH_WIDTH_40MHZ)
+		bw_offset = 1 << BW_40_OFFSET_BIT;
+	else if (ch_width == CH_WIDTH_20MHZ)
+		bw_offset = 1 << BW_20_OFFSET_BIT;
+
+	return bw_offset;
+}
+
+#else /* !FEATURE_WLAN_TDLS */
+
+static inline uint8_t hdd_get_bw_offset(uint32_t ch_width)
+{
+	return 0;
+}
+
+#endif /* FEATURE_WLAN_TDLS */
 
 #ifdef QCA_HT_2040_COEX
 static void wlan_hdd_cfg80211_start_pending_acs(struct work_struct *work);
@@ -1918,10 +1938,6 @@ static int hdd_update_reg_chan_info(struct hdd_adapter *adapter,
 		if (chan == 0)
 			continue;
 
-		if (sap_config->acs_cfg.ch_width == CH_WIDTH_40MHZ)
-			bw_offset = 1 << BW_40_OFFSET_BIT;
-		else if (sap_config->acs_cfg.ch_width == CH_WIDTH_20MHZ)
-			bw_offset = 1 << BW_20_OFFSET_BIT;
 		icv->freq = wlan_reg_get_channel_freq(hdd_ctx->pdev, chan);
 		icv->ieee_chan_number = chan;
 		icv->max_reg_power = wlan_reg_get_channel_reg_power(
@@ -1933,6 +1949,7 @@ static int hdd_update_reg_chan_info(struct hdd_adapter *adapter,
 		/* not supported in current driver */
 		icv->max_antenna_gain = 0;
 
+		bw_offset = hdd_get_bw_offset(sap_config->acs_cfg.ch_width);
 		icv->reg_class_id =
 			wlan_hdd_find_opclass(mac_handle, chan, bw_offset);
 

core/hdd/src/wlan_hdd_main.c

@@ -1385,10 +1385,7 @@ static int hdd_update_tdls_config(struct hdd_context *hdd_ctx)
 				 vdev_ini_cfg.rx_nss[NSS_CHAINS_BAND_2GHZ]);
 	cfg_tdls_set_vdev_nss_5g(hdd_ctx->psoc,
 				 vdev_ini_cfg.rx_nss[NSS_CHAINS_BAND_5GHZ]);
-	tdls_cfg.tdls_send_mgmt_req = eWNI_SME_TDLS_SEND_MGMT_REQ;
-	tdls_cfg.tdls_add_sta_req = eWNI_SME_TDLS_ADD_STA_REQ;
-	tdls_cfg.tdls_del_sta_req = eWNI_SME_TDLS_DEL_STA_REQ;
-	tdls_cfg.tdls_update_peer_state = WMA_UPDATE_TDLS_PEER_STATE;
+	hdd_init_tdls_config(&tdls_cfg);
 	tdls_cfg.tdls_del_all_peers = eWNI_SME_DEL_ALL_TDLS_PEERS;
 	tdls_cfg.tdls_update_dp_vdev_flags = CDP_UPDATE_TDLS_FLAGS;
 	tdls_cfg.tdls_event_cb = wlan_cfg80211_tdls_event_callback;
@@ -1444,8 +1441,9 @@ static void hdd_update_tgt_services(struct hdd_context *hdd_ctx,
 	bool tdls_off_channel;
 	bool tdls_buffer_sta;
 	uint32_t tdls_uapsd_mask;
-	bool value;
 #endif
+	bool value;
+
 	/* Set up UAPSD */
 	ucfg_mlme_set_sap_uapsd_flag(hdd_ctx->psoc, cfg->uapsd);
 

core/hdd/src/wlan_hdd_tdls.c

@@ -920,3 +920,11 @@ QDF_STATUS hdd_tdls_deregister_peer(void *userdata, uint32_t vdev_id,
 
 	return hdd_roam_deregister_tdlssta(adapter, sta_id);
 }
+
+void hdd_init_tdls_config(struct tdls_start_params *tdls_cfg)
+{
+	tdls_cfg->tdls_send_mgmt_req = eWNI_SME_TDLS_SEND_MGMT_REQ;
+	tdls_cfg->tdls_add_sta_req = eWNI_SME_TDLS_ADD_STA_REQ;
+	tdls_cfg->tdls_del_sta_req = eWNI_SME_TDLS_DEL_STA_REQ;
+	tdls_cfg->tdls_update_peer_state = WMA_UPDATE_TDLS_PEER_STATE;
+}

core/mac/src/pe/lim/lim_api.c

@@ -265,10 +265,12 @@ static void __lim_init_ht_vars(tpAniSirGlobal mac)
 
 static QDF_STATUS __lim_init_config(tpAniSirGlobal mac)
 {
-	uint32_t val1;
-	bool valb;
 	struct mlme_ht_capabilities_info *ht_cap_info;
+#ifdef FEATURE_WLAN_TDLS
 	QDF_STATUS status;
+	uint32_t val1;
+	bool valb;
+#endif
 
 	/* Read all the CFGs here that were updated before pe_start is called */
 	/* All these CFG READS/WRITES are only allowed in init, at start when there is no session

core/mac/src/pe/lim/lim_process_message_queue.c

@@ -1462,9 +1462,9 @@ static void lim_process_messages(tpAniSirGlobal mac_ctx,
 	cds_pkt_t *body_ptr = NULL;
 	QDF_STATUS qdf_status;
 	struct scheduler_msg new_msg = {0};
-	uint8_t session_id;
 
 #ifdef FEATURE_WLAN_TDLS
+	uint8_t session_id;
 	tSirTdlsInd *tdls_ind = NULL;
 	tpDphHashNode sta_ds = NULL;
 #endif