qcacld-3.0: Initialize SAP timer gracefully

Currently hdd_medium_assess_init() and hdd_medium_assess_deinit()
are being invoked from hdd_hostapd_sap_event_cb. Timer counter is
not being incremented properly for multiple SAP concurrencies.
Hence seeing assert during the timer deinit.

To address this issue invoke hdd_medium_assess_init() explicitly
from wlan_hdd_cfg80211_start_bss , wlan_hdd_start_sap and
hdd_restart_sap.

Change-Id: I03b2567fd25119ff82f2c85939c31eb0ccf6cdb7
CRs-Fixed: 3432439

core/hdd/src/wlan_hdd_hostapd.c

@@ -1986,9 +1986,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 			      ap_ctx->operating_chan_freq,
 			      sap_config->ch_params.ch_width);
 
-		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;
 
@@ -2192,6 +2189,14 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		}
 		hdd_nofl_info("Ap stopped vid %d reason=%d", adapter->vdev_id,
 			      ap_ctx->bss_stop_reason);
+		qdf_status =
+			policy_mgr_get_mac_id_by_session_id(hdd_ctx->psoc,
+							    adapter->vdev_id,
+							    &pdev_id);
+		if (QDF_IS_STATUS_SUCCESS(qdf_status))
+			hdd_medium_assess_stop_timer(pdev_id, hdd_ctx);
+
+		hdd_medium_assess_deinit();
 
 		/* clear the reason code in case BSS is stopped
 		 * in another place
@@ -2934,15 +2939,6 @@ stopbss:
 		       sap_event->sapevt.sapStopBssCompleteEvent.status ?
 		       "eSAP_STATUS_FAILURE" : "eSAP_STATUS_SUCCESS");
 
-		qdf_status =
-			policy_mgr_get_mac_id_by_session_id(hdd_ctx->psoc,
-							    adapter->vdev_id,
-							    &pdev_id);
-		if (QDF_IS_STATUS_SUCCESS(qdf_status))
-			hdd_medium_assess_stop_timer(pdev_id, hdd_ctx);
-
-		hdd_medium_assess_deinit();
-
 		/* Change the BSS state now since, as we are shutting
 		 * things down, we don't want interfaces to become
 		 * re-enabled
@@ -6706,6 +6702,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	hdd_set_connection_in_progress(false);
 	policy_mgr_process_force_scc_for_nan(hdd_ctx->psoc);
 	ret = 0;
+	hdd_medium_assess_init();
 	goto free;
 
 error:

core/hdd/src/wlan_hdd_main.c

@@ -16715,6 +16715,8 @@ void wlan_hdd_start_sap(struct hdd_adapter *ap_adapter, bool reinit)
 	}
 	hdd_info("SAP Start Success");
 
+	if (reinit)
+		hdd_medium_assess_init();
 	wlansap_reset_sap_config_add_ie(sap_config, eUPDATE_IE_ALL);
 	set_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags);
 	if (hostapd_state->bss_state == BSS_START) {
@@ -19376,6 +19378,7 @@ void hdd_restart_sap(struct hdd_adapter *ap_adapter)
 		wlansap_reset_sap_config_add_ie(sap_config,
 						eUPDATE_IE_ALL);
 		hdd_err("SAP Start Success");
+		hdd_medium_assess_init();
 		set_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags);
 		if (hostapd_state->bss_state == BSS_START) {
 			policy_mgr_incr_active_session(hdd_ctx->psoc,

core/hdd/src/wlan_hdd_medium_assess.c

@@ -780,10 +780,3 @@ 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;
-}

core/hdd/src/wlan_hdd_medium_assess.h

@@ -117,13 +117,6 @@ 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
@@ -144,10 +137,6 @@ 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) {}