qcacld-3.0: change mac for policy manager restructuring
Modify mac code to cope with the policy manager moving to host
common.
Change-Id: I2fa5f7ed1a597b4fa5cea6aa87f5ed9f849a1cd7
CRs-Fixed: 2009818
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 07589e0..349bc49 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -69,7 +69,7 @@
#include "cds_utils.h"
#include "sys_startup.h"
#include "cds_api.h"
-#include "cds_concurrency.h"
+#include "wlan_policy_mgr_api.h"
#include "nan_datapath.h"
#include "wma.h"
#include "wlan_mgmt_txrx_utils_api.h"
diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c
index 54e14fc..f2d631c 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -54,7 +54,7 @@
#include "lim_send_messages.h"
#include "rrm_api.h"
#include "lim_session_utils.h"
-#include "cds_concurrency.h"
+#include "wlan_policy_mgr_api.h"
#include "wma_types.h"
#include "wma.h"
#include <cdp_txrx_cmn.h>
@@ -404,10 +404,10 @@
* and no concurrent session is running.
*/
if (!((session_entry->currentOperChannel != target_channel) &&
- ((cds_get_channel_state(target_channel)
+ ((cds_get_channel_state(target_channel)
== CHANNEL_STATE_ENABLE) ||
- (cds_get_channel_state(target_channel) == CHANNEL_STATE_DFS &&
- !cds_concurrent_open_sessions_running())))) {
+ (cds_get_channel_state(target_channel) == CHANNEL_STATE_DFS &&
+ !policy_mgr_concurrent_open_sessions_running(mac_ctx->psoc))))) {
lim_log(mac_ctx, LOGE, FL("Channel %d is not valid"),
target_channel);
return;
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index 81a54fe..b08d401 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -62,7 +62,7 @@
#include "qdf_types.h"
#include "cds_packet.h"
#include "qdf_mem.h"
-#include "cds_concurrency.h"
+#include "wlan_policy_mgr_api.h"
#include "nan_datapath.h"
void lim_log_session_states(tpAniSirGlobal pMac);
diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
index d732644..aaf381b 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
@@ -48,7 +48,7 @@
#include "wma_types.h"
#include "cds_utils.h"
#include "lim_types.h"
-#include "cds_concurrency.h"
+#include "wlan_policy_mgr_api.h"
#include "nan_datapath.h"
#define MAX_SUPPORTED_PEERS_WEP 16
@@ -3241,7 +3241,8 @@
/* If MCC upgrade/DBS downgrade happended during channel switch,
* the policy manager connection table needs to be updated.
*/
- cds_update_connection_info(psessionEntry->smeSessionId);
+ policy_mgr_update_connection_info(pMac->psoc,
+ psessionEntry->smeSessionId);
if (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) {
lim_log(pMac, LOG1,
FL("Send p2p operating channel change conf action frame once first beacon is received on new channel"));
@@ -3259,12 +3260,13 @@
* SAP.
*/
lim_send_sme_ap_channel_switch_resp(pMac, psessionEntry,
- pChnlParams);
+ pChnlParams);
/* If MCC upgrade/DBS downgrade happended during channel switch,
* the policy manager connection table needs to be updated.
*/
- cds_update_connection_info(psessionEntry->smeSessionId);
- cds_set_do_hw_mode_change_flag(true);
+ policy_mgr_update_connection_info(pMac->psoc,
+ psessionEntry->smeSessionId);
+ policy_mgr_set_do_hw_mode_change_flag(pMac->psoc, true);
}
break;
default:
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index a47927c..1c059ec 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -135,7 +135,7 @@
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
struct scheduler_msg message;
- struct sir_hw_mode *req_msg;
+ struct policy_mgr_hw_mode *req_msg;
uint32_t len;
struct s_sir_set_hw_mode *buf;
struct scheduler_msg resp_msg;