Просмотр исходного кода

qcacld-3.0: revert "qcacld-3.0: Initialize timer for SAP+SAP concurrency"

This reverts Change-id: I12e8871fb606d180eabc63c8841017d7240ac829
Revert the change as it causes timer leak in case of
When SAP starts on DFS channel for CAC the timer 
hdd_medium_assess_init() need to be initialized properly.

Change-Id: I489bdd37b4935d98c8a3c30da2f52316c29743a7
CRs-Fixed: 3393190
Aravind Kishore Sukla 2 лет назад
Родитель
Сommit
d30b151ccd

+ 2 - 1
core/hdd/src/wlan_hdd_hostapd.c

@@ -1984,7 +1984,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 			      ap_ctx->operating_chan_freq,
 			      sap_config->ch_params.ch_width);
 
-		hdd_medium_assess_init();
+		if (hdd_medium_access_state() == true)
+			hdd_medium_assess_init();
 
 		sap_config->ch_params = ap_ctx->sap_context->ch_params;
 		sap_config->sec_ch_freq = ap_ctx->sap_context->sec_ch_freq;

+ 7 - 0
core/hdd/src/wlan_hdd_medium_assess.c

@@ -780,3 +780,10 @@ void hdd_medium_assess_deinit(void)
 		qdf_mc_timer_destroy(&hdd_medium_assess_timer);
 	}
 }
+
+bool hdd_medium_access_state(void)
+{
+	if (!timer_enable)
+		return true;
+	return false;
+}

+ 11 - 0
core/hdd/src/wlan_hdd_medium_assess.h

@@ -117,6 +117,13 @@ void hdd_medium_assess_init(void);
  */
 void hdd_medium_assess_deinit(void);
 
+/**
+ * hdd_medium_access_state() - medium assess timer state
+ *
+ * Return: true if timer not initialized else false
+ */
+
+bool hdd_medium_access_state(void);
 /**
  * hdd_medium_assess_stop_timer() - medium assess reset and stop timer
  * @pdev_id: pdev id
@@ -137,6 +144,10 @@ void hdd_medium_assess_ssr_enable_flag(void);
 #define FEATURE_MEDIUM_ASSESS_VENDOR_EVENTS
 static inline void hdd_medium_assess_init(void) {}
 static inline void hdd_medium_assess_deinit(void) {}
+static inline bool hdd_medium_access_state(void)
+{
+	return false;
+}
 static inline void hdd_medium_assess_stop_timer(uint8_t pdev_id,
 						struct hdd_context *hdd_ctx) {}
 static inline void hdd_medium_assess_ssr_enable_flag(void) {}