qcacld-3.0: Move the SAP to non DFS channel after STA disconnection

Standalone SAP is not allowed on DFS channel if STA+SAP SCC enabled
on DFS channel. So move the SAP to a non DFS channel as soon as STA
gets disconnect.

CRs-Fixed: 2145495
Change-Id: I27d018739f53997641a7113cfc7c844e02bd7e29

core/hdd/src/wlan_hdd_assoc.c

@@ -1853,6 +1853,8 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 	}
 	wlan_hdd_clear_link_layer_stats(adapter);
 
+	hdd_debug("check for SAP restart");
+	policy_mgr_check_concurrent_intf_and_restart_sap(hdd_ctx->hdd_psoc);
 	adapter->hdd_stats.tx_rx_stats.cont_txtimeout_cnt = 0;
 
 	/* Unblock anyone waiting for disconnect to complete */

core/hdd/src/wlan_hdd_hostapd.c

@@ -2848,6 +2848,19 @@ QDF_STATUS wlan_hdd_get_channel_for_sap_restart(
 		return QDF_STATUS_E_FAILURE;
 	}
 
+	if (policy_mgr_get_connection_count(psoc) == 1) {
+		/*
+		 * If STA+SAP sessions are on DFS channel and STA+SAP SCC is
+		 * enabled on DFS channel then move the SAP out of DFS channel
+		 * as soon as STA gets disconnect.
+		 */
+		if (policy_mgr_is_sap_restart_required_after_sta_disconnect(
+			psoc, &intf_ch)) {
+			hdd_debug("Move the sap to user configured channel %u",
+				  intf_ch);
+			goto sap_restart;
+		}
+	}
 	/*
 	 * Check if STA's channel is DFS or passive or part of LTE avoided
 	 * channel list. In that case move SAP to other band if DBS is
@@ -2870,6 +2883,7 @@ QDF_STATUS wlan_hdd_get_channel_for_sap_restart(
 		}
 	}
 
+sap_restart:
 	if (intf_ch == 0) {
 		hdd_debug("interface channel is 0");
 		return QDF_STATUS_E_FAILURE;
@@ -4382,6 +4396,8 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 		pConfig->acs_dfs_mode = wlan_hdd_get_dfs_mode(mode);
 	}
 
+	policy_mgr_update_user_config_sap_chan(hdd_ctx->hdd_psoc,
+					       pConfig->channel);
 	hdd_debug("pConfig->channel %d, pConfig->acs_dfs_mode %d",
 		pConfig->channel, pConfig->acs_dfs_mode);