qcacld-3.0: Store chan info event results in STA mode also

Currently, channel info event results are stored only if it is
received as part of SAP ACS scan. Channel info is used in
ACS algorithm to select best channel. There is a requirement to
reuse the STA's scan results for SAP to reduce the SAP bringup
time. So store the channel info event results received as part
of STA scan if WLAN_FEATURE_SAP_ACS_OPTIMIZE is enabled.

Change-Id: I99d4e8c13a9e4171c74c63907d29c585f89ecf9e
CRs-Fixed: 3239383

core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c

@@ -3187,7 +3187,8 @@ void lim_process_rx_channel_status_event(struct mac_context *mac_ctx, void *buf)
 		return;
 	}
 
-	if (mac_ctx->sap.acs_with_more_param)
+	if (mac_ctx->sap.acs_with_more_param ||
+	    sap_is_acs_scan_optimize_enable())
 		lim_add_channel_status_info(mac_ctx, chan_status,
 					    chan_status->channel_id);
 	else

core/sap/inc/sap_api.h

@@ -1819,6 +1819,18 @@ sap_cac_end_notify(mac_handle_t mac_handle,
 }
 #endif /* PRE_CAC_SUPPORT */
 
+#ifdef WLAN_FEATURE_SAP_ACS_OPTIMIZE
+static inline bool sap_is_acs_scan_optimize_enable(void)
+{
+	return true;
+}
+#else
+static inline bool sap_is_acs_scan_optimize_enable(void)
+{
+	return false;
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif

core/wma/src/wma_features.c

@@ -5112,7 +5112,8 @@ int wma_chan_info_event_handler(void *handle, uint8_t *event_buf,
 	mode = wlan_vdev_mlme_get_opmode(vdev);
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_WMA_ID);
 
-	if (mac->sap.acs_with_more_param && mode == QDF_SAP_MODE) {
+	if ((mac->sap.acs_with_more_param && mode == QDF_SAP_MODE) ||
+	    sap_is_acs_scan_optimize_enable()) {
 		channel_status = qdf_mem_malloc(sizeof(*channel_status));
 		if (!channel_status)
 			return -ENOMEM;