qcacld-3.0: Make ini acs_with_more_param take effect

When ini acs_with_more_param is configured as 1, more params should be
added into ACS calculation process. Currently, even acs_with_more_param
is set as 1, mac->sap.acs_with_more_param is still 0 and no params are
added to ACS calculation process.

Make mac->sap.acs_with_more_param change as ini acs_with_more_param.

Change-Id: I4ced3b1d7d07c0f919183df42191e51ba66b90e8
CRs-Fixed: 2458086

core/hdd/src/wlan_hdd_hostapd.c

@@ -3259,6 +3259,7 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit)
 	struct sap_context *sap_context = NULL;
 	int ret;
 	enum dfs_mode acs_dfs_mode;
+	bool acs_with_more_param = 0;
 
 	hdd_enter();
 
@@ -3279,6 +3280,14 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit)
 			wlan_hdd_get_dfs_mode(acs_dfs_mode);
 	}
 
+	status = ucfg_mlme_get_acs_with_more_param(hdd_ctx->psoc,
+						   &acs_with_more_param);
+	if (!QDF_IS_STATUS_SUCCESS(status))
+		hdd_err("can't get sap acs with more param, use def");
+
+	wlan_sap_set_acs_with_more_param(hdd_ctx->mac_handle,
+					 acs_with_more_param);
+
 	/* Allocate the Wireless Extensions state structure */
 	phostapdBuf = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter);
 

core/sap/inc/sap_api.h

@@ -1131,6 +1131,17 @@ wlan_sap_set_channel_avoidance(mac_handle_t mac_handle,
 			       bool sap_channel_avoidance);
 #endif
 
+/**
+ * wlan_sap_set_acs_with_more_param() - sets acs_with_more_param ini param
+ * @mac_handle: Opaque handle to the global MAC context
+ * @acs_with_more_param: ini parameter value
+ *
+ * Return: The QDF_STATUS code.
+ */
+QDF_STATUS
+wlan_sap_set_acs_with_more_param(mac_handle_t mac_handle,
+				 bool acs_with_more_param);
+
 /**
  * wlansap_set_dfs_preferred_channel_location() - set dfs preferred channel
  * @mac_handle: Opaque handle to the global MAC context

core/sap/src/sap_module.c

@@ -2026,6 +2026,24 @@ wlan_sap_set_channel_avoidance(mac_handle_t mac_handle,
 }
 #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */
 
+QDF_STATUS
+wlan_sap_set_acs_with_more_param(mac_handle_t mac_handle,
+				 bool acs_with_more_param)
+{
+	struct mac_context *mac_ctx;
+
+	if (mac_handle) {
+		mac_ctx = MAC_CONTEXT(mac_handle);
+	} else {
+		QDF_TRACE(QDF_MODULE_ID_SAP,
+			  QDF_TRACE_LEVEL_ERROR,
+			  FL("mac_handle or mac_ctx pointer NULL"));
+		return QDF_STATUS_E_FAULT;
+	}
+	mac_ctx->sap.acs_with_more_param = acs_with_more_param;
+	return QDF_STATUS_SUCCESS;
+}
+
 QDF_STATUS
 wlansap_set_dfs_preferred_channel_location(mac_handle_t mac_handle)
 {