qcacmn: Fix hw mode change issue in case of DBS

The driver stops the oppurtunitistic timer for DBS, when
the start AP requests come, which results in HW mode stuck
in DBS if the next vdev start request comes on the same MAC
This further results in NSS = 1 for the MAC, hence throughput
decreases.

Fix is to set hw mode to single MAC in case the STA/SAP comes up
in the band/channel

Change-Id: I8ec4282c78594ee7e133a1e7768fa230bb2e8180
CRs-Fixed: 2273443

umac/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -1442,6 +1442,10 @@ void policy_mgr_checkn_update_hw_mode_single_mac_mode(
 		return;
 	}
 
+	if (QDF_TIMER_STATE_RUNNING ==
+		pm_ctx->dbs_opportunistic_timer.state)
+		qdf_mc_timer_stop(&pm_ctx->dbs_opportunistic_timer);
+
 	qdf_mutex_acquire(&pm_ctx->qdf_conc_list_lock);
 	for (i = 0; i < MAX_NUMBER_OF_CONC_CONNECTIONS; i++) {
 		if (pm_conc_connection_list[i].in_use)
@@ -1453,11 +1457,6 @@ void policy_mgr_checkn_update_hw_mode_single_mac_mode(
 			}
 	}
 	qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
-
-	if (QDF_TIMER_STATE_RUNNING ==
-		pm_ctx->dbs_opportunistic_timer.state)
-		qdf_mc_timer_stop(&pm_ctx->dbs_opportunistic_timer);
-
 	pm_dbs_opportunistic_timer_handler((void *)psoc);
 }