diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 4dad90187906..8f0c1325a122 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -451,18 +451,6 @@ struct s_sir_set_hw_mode { struct policy_mgr_hw_mode set_hw; }; -/** - * struct sir_dual_mac_config - Dual MAC configuration - * @scan_config: Scan configuration - * @fw_mode_config: FW mode configuration - * @set_dual_mac_cb: Callback function to be executed on response to the command - */ -struct sir_dual_mac_config { - uint32_t scan_config; - uint32_t fw_mode_config; - void *set_dual_mac_cb; -}; - /** * struct sir_set_dual_mac_cfg - Set Dual mac config request * @message_type: Message type @@ -472,7 +460,7 @@ struct sir_dual_mac_config { struct sir_set_dual_mac_cfg { uint16_t message_type; uint16_t length; - struct sir_dual_mac_config set_dual_mac; + struct policy_mgr_dual_mac_config set_dual_mac; }; /** @@ -5674,8 +5662,6 @@ typedef void (*hw_mode_transition_cb)(uint32_t old_hw_mode_index, uint32_t new_hw_mode_index, uint32_t num_vdev_mac_entries, struct policy_mgr_vdev_mac_map *vdev_mac_map); -typedef void (*dual_mac_cb)(uint32_t status, uint32_t scan_config, - uint32_t fw_mode_config); typedef void (*antenna_mode_cb)(uint32_t status); /** 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 c6cccd2890de..fbf72f05ae41 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 @@ -200,7 +200,7 @@ static QDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac, { QDF_STATUS status = QDF_STATUS_SUCCESS; struct scheduler_msg message = {0}; - struct sir_dual_mac_config *req_msg; + struct policy_mgr_dual_mac_config *req_msg; uint32_t len; struct sir_set_dual_mac_cfg *buf; struct scheduler_msg resp_msg = {0}; diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index c53a942ede99..ea0c3b1bff55 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -162,7 +162,7 @@ typedef struct tagSmeCmd { #endif struct policy_mgr_hw_mode set_hw_mode_cmd; struct s_nss_update_cmd nss_update_cmd; - struct sir_dual_mac_config set_dual_mac_cmd; + struct policy_mgr_dual_mac_config set_dual_mac_cmd; struct sir_antenna_mode_param set_antenna_mode_cmd; } u; } tSmeCmd; diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 572546c04a01..ffc7d83f9967 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -2086,7 +2086,7 @@ QDF_STATUS wma_send_pdev_set_hw_mode_cmd(tp_wma_handle wma_handle, struct policy_mgr_hw_mode *msg); QDF_STATUS wma_send_pdev_set_dual_mac_config(tp_wma_handle wma_handle, - struct sir_dual_mac_config *msg); + struct policy_mgr_dual_mac_config *msg); QDF_STATUS wma_send_pdev_set_antenna_mode(tp_wma_handle wma_handle, struct sir_antenna_mode_param *msg); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 19d4dc520802..e83874583071 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -8309,7 +8309,7 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg) break; case SIR_HAL_PDEV_DUAL_MAC_CFG_REQ: wma_send_pdev_set_dual_mac_config(wma_handle, - (struct sir_dual_mac_config *)msg->bodyptr); + (struct policy_mgr_dual_mac_config *)msg->bodyptr); qdf_mem_free(msg->bodyptr); break; case WMA_SET_IE_INFO: @@ -8640,7 +8640,7 @@ fail: * Return: QDF_STATUS. 0 on success. */ QDF_STATUS wma_send_pdev_set_dual_mac_config(tp_wma_handle wma_handle, - struct sir_dual_mac_config *msg) + struct policy_mgr_dual_mac_config *msg) { QDF_STATUS status; @@ -8663,7 +8663,7 @@ QDF_STATUS wma_send_pdev_set_dual_mac_config(tp_wma_handle wma_handle, WMA_VDEV_PLCY_MGR_CMD_TIMEOUT); status = wmi_unified_pdev_set_dual_mac_config_cmd( wma_handle->wmi_handle, - (struct wmi_dual_mac_config *)msg); + (struct policy_mgr_dual_mac_config *)msg); if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("%s: Failed to send WMI_PDEV_SET_DUAL_MAC_CONFIG_CMDID: %d", __func__, status);