qcacld-3.0: Reset channel switch in progress on deinit ap

Currently if channel switch is in progress and if deinit
ap comes, channel switch does not gets complete and driver
does not reset channel switch in progress in adapter. Now
if driver receives channel change cb in hdd from regulatory,
it tries to restart the sap according to updated channel list,
but it waits for channels switch in progress to be completed
by taking the netdev reference for SAP adapter and this wait is
of 2 seconds, in this time if del virtual interface comes for
SAP adapter comes in that case it will detect the net dev ref
leak as one net dev ref is taken by country change work.

To address above issue, complete the channel change on deinit
ap mode and also check if SAP is started in country change
work before starting to wait for channel switch in progress.

Change-Id: I349e217a94093b3751310d4f7378fb6585f77743
CRs-Fixed: 2969343

core/hdd/src/wlan_hdd_hostapd.c

@@ -3758,6 +3758,10 @@ void hdd_deinit_ap_mode(struct hdd_context *hdd_ctx,
 		clear_bit(WMM_INIT_DONE, &adapter->event_flags);
 	}
 	qdf_atomic_set(&adapter->session.ap.acs_in_progress, 0);
+	if (qdf_atomic_read(&adapter->ch_switch_in_progress)) {
+		qdf_atomic_set(&adapter->ch_switch_in_progress, 0);
+		policy_mgr_set_chan_switch_complete_evt(hdd_ctx->psoc);
+	}
 
 	hdd_softap_deinit_tx_rx(adapter);
 	if (hdd_hostapd_deinit_sap_session(adapter))

core/hdd/src/wlan_hdd_regulatory.c

@@ -1615,6 +1615,11 @@ static void hdd_country_change_update_sap(struct hdd_context *hdd_ctx)
 						     adapter->vdev_id);
 			break;
 		case QDF_SAP_MODE:
+			if (!test_bit(SOFTAP_INIT_DONE,
+				      &adapter->event_flags)) {
+				hdd_info("AP is not started yet");
+				break;
+			}
 			sap_config = &adapter->session.ap.sap_config;
 			reg_phy_mode = csr_convert_to_reg_phy_mode(
 						sap_config->sap_orig_hw_mode,