A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Consistently use policy_mgr_dual_mac_config

Browse source 
Remove duplicate structs wmi_dual_mac_config and sir_dual_mac_config
and use policy_mgr_dual_mac_config.

Change-Id: I6da6539f519ec46ee274ba3f3ae042e5fd9c25d2
CRs-Fixed: 2190993
This commit is contained in:
Srinivas Girigowda 2018-02-15 17:04:22 -08:00 • committed by nshrivas
commit eb6ecf3f96
5 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/mac/inc/sir_api.h
View file

@ -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);
/**

2
core/mac/src/pe/lim/lim_process_sme_req_messages.c
View file

@ -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};

2
core/sme/inc/sme_inside.h
View file

@ -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;

2
core/wma/inc/wma.h
View file

@ -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);

6
core/wma/src/wma_main.c
View file

@ -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);