Parcourir la source

qcacld-3.0: Properly featurize mobile router

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

Change-Id: Ic9e1f608bc631409fbb5bcf84fc3f4520d69a7c9
CRs-Fixed: 2355786
jiad il y a 6 ans
Parent
commit
391c528b3e
3 fichiers modifiés avec 19 ajouts et 4 suppressions
  1. 15 1
      core/dp/txrx/ol_txrx.c
  2. 2 1
      core/sap/src/sap_ch_select.c
  3. 2 2
      core/wma/src/wma_features.c

+ 15 - 1
core/dp/txrx/ol_txrx.c

@@ -2471,7 +2471,21 @@ static uint16_t ol_txrx_set_ibss_vdev_heart_beat_timer(struct cdp_vdev *pvdev,
 
 	return old_timer_value;
 }
-#endif
+#else /* !QCA_IBSS_SUPPORT */
+static inline int16_t
+ol_txrx_update_ibss_add_peer_num_of_vdev(struct cdp_vdev *pvdev,
+					 int16_t peer_num_delta)
+{
+	return 0;
+}
+
+static inline uint16_t
+ol_txrx_set_ibss_vdev_heart_beat_timer(struct cdp_vdev *pvdev,
+				       uint16_t timer_value_sec)
+{
+	return 0;
+}
+#endif /* QCA_IBSS_SUPPORT */
 
 /**
  * ol_txrx_remove_peers_for_vdev() - remove all vdev peers with lock held

+ 2 - 1
core/sap/src/sap_ch_select.c

@@ -43,6 +43,7 @@
 #ifdef FEATURE_AP_MCC_CH_AVOIDANCE
 #include "lim_utils.h"
 #include "parser_api.h"
+#include <wlan_utility.h>
 #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */
 #include "cds_utils.h"
 #include "pld_common.h"
@@ -327,7 +328,7 @@ static void sap_process_avoid_ie(mac_handle_t mac_handle,
 			  tSapChSelSpectInfo *spect_info)
 {
 	uint32_t total_ie_len = 0;
-	uint8_t *temp_ptr = NULL;
+	const uint8_t *temp_ptr = NULL;
 	uint8_t i = 0;
 	struct sAvoidChannelIE *avoid_ch_ie;
 	tCsrScanResultInfo *node = NULL;

+ 2 - 2
core/wma/src/wma_features.c

@@ -176,7 +176,7 @@ static inline void qdf_wma_wow_wakeup_stats_event(tp_wma_handle wma)
 
 #ifdef FEATURE_WLAN_AUTO_SHUTDOWN
 /**
- * wma_post_auto_shutdown_msg() - to post auto shutdown event to sme
+ * wma_wake_reason_auto_shutdown() - to post auto shutdown event to sme
  *
  * Return: 0 for success or error code
  */
@@ -3868,7 +3868,7 @@ int wma_auto_shutdown_event_handler(void *handle, uint8_t *event,
 
 	WMA_LOGD("%s:%d: Auto Shutdown Evt: %d", __func__, __LINE__,
 		 wmi_auto_sh_evt->shutdown_reason);
-	return wma_post_auto_shutdown_msg();
+	return wma_wake_reason_auto_shutdown();
 }
 
 /**