qcacld-3.0: legacy code change for policy manager restructuring
Modify legacy code to cope with the policy manager moving to host
common
CRs-Fixed: 2009818
Change-Id: Ifa27ecdf1e37eda6f929f89da603bc356e9cb7fd
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 20d38ed..417818a 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -87,6 +87,7 @@
#ifdef WLAN_FEATURE_LINK_LAYER_STATS
#include "wlan_hdd_stats.h"
#endif
+#include "cds_api.h"
#include "cds_concurrency.h"
#include "qwlan_version.h"
#include "wlan_hdd_memdump.h"
@@ -8100,7 +8101,7 @@
ap_ctx->sapConfig.sec_ch,
&ap_ctx->sapConfig.ch_params);
- cds_restart_sap(hostapd_adapter);
+ hdd_restart_sap(hostapd_adapter);
}
if (tb[QCA_WLAN_VENDOR_ATTR_SAP_MANDATORY_FREQUENCY_LIST]) {
@@ -8672,7 +8673,7 @@
sap_config->acs_cfg.ch_width = channel_list->chan_width;
hdd_ap_ctx->sapConfig.ch_width_orig =
channel_list->chan_width;
- hdd_restart_sap(adapter, sap_config->acs_cfg.pri_ch);
+ hdd_switch_sap_channel(adapter, sap_config->acs_cfg.pri_ch);
break;
default:
@@ -13195,18 +13196,6 @@
pRoamProfile->nAddIEScanLength =
pAdapter->scan_info.scanAddIE.length;
}
- /*
- * When policy manager is enabled from ini file, we shouldn't
- * check for other concurrency rules.
- */
- if (wma_is_hw_dbs_capable() == false) {
- cds_handle_conc_rule1(pAdapter, pRoamProfile);
- if (true != cds_handle_conc_rule2(
- pAdapter, pRoamProfile, &roamId)) {
- status = 0;
- goto conn_failure;
- }
- }
if ((wma_is_hw_dbs_capable() == true) &&
(false == wlan_hdd_handle_sap_sta_dfs_conc(pAdapter,