From d3f552ff90ab4a5468dc7069e09a63aec9ca4557 Mon Sep 17 00:00:00 2001 From: Akshay Kosigi Date: Thu, 7 Mar 2019 19:25:20 +0530 Subject: [PATCH] qcacmn: Fix the typo for PROFILE_IDX Fix the typo for PROFILE_IDX and also add WMI macros for short slot time update under MLME. Change-Id: I3c09a7f01029af0f075086166be1c85bd1d7de34 CRs-Fixed: 2412160 --- .../vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h | 5 +++++ umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_ucfg_api.h | 2 +- umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mgr_utils_api.c | 4 ++-- wmi/inc/wmi_unified_param.h | 3 +++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h index 952ab9bd73..9ce33ed2c0 100644 --- a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h +++ b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h @@ -38,6 +38,11 @@ struct mlme_mac_ssid { uint8_t mac_ssid[WLAN_SSID_MAX_LEN]; } qdf_packed; +/** slot time long */ +#define WLAN_MLME_VDEV_SLOT_TIME_LONG 0x1 +/** slot time short */ +#define WLAN_MLME_VDEV_SLOT_TIME_SHORT 0x2 + /** * enum MLME_bcn_tx_rate_code - beacon tx rate code */ diff --git a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_ucfg_api.h b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_ucfg_api.h index a8677a6c94..f89d0223b6 100644 --- a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_ucfg_api.h +++ b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_ucfg_api.h @@ -81,7 +81,7 @@ enum wlan_mlme_cfg_id { WLAN_MLME_CFG_MODDTIM_CNT, WLAN_MLME_CFG_BEACON_BUFFER, WLAN_MLME_CFG_BEACON_OFFSETS, - WLAN_MLME_CFG_PROILE_IDX, + WLAN_MLME_CFG_PROFILE_IDX, WLAN_MLME_CFG_PROFILE_NUM, WLAN_MLME_CFG_MBSSID_FLAGS, WLAN_MLME_CFG_VDEVID_TRANS, diff --git a/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mgr_utils_api.c b/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mgr_utils_api.c index 7dd4b44767..75baafa2c6 100644 --- a/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mgr_utils_api.c +++ b/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mgr_utils_api.c @@ -261,7 +261,7 @@ wlan_util_vdev_mlme_set_param(struct vdev_mlme_obj *vdev_mlme, case WLAN_MLME_CFG_MODDTIM_CNT: mlme_mgmt->powersave_info.moddtim_cnt = mlme_cfg.value; break; - case WLAN_MLME_CFG_PROILE_IDX: + case WLAN_MLME_CFG_PROFILE_IDX: mlme_mgmt->mbss_11ax.profile_idx = mlme_cfg.value; break; case WLAN_MLME_CFG_PROFILE_NUM: @@ -485,7 +485,7 @@ void wlan_util_vdev_mlme_get_param(struct vdev_mlme_obj *vdev_mlme, case WLAN_MLME_CFG_MODDTIM_CNT: *value = mlme_mgmt->powersave_info.moddtim_cnt; break; - case WLAN_MLME_CFG_PROILE_IDX: + case WLAN_MLME_CFG_PROFILE_IDX: *value = mlme_mgmt->mbss_11ax.profile_idx; break; case WLAN_MLME_CFG_PROFILE_NUM: diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index e73af33b76..835f730a6f 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -5962,10 +5962,13 @@ typedef enum { #define WMI_HOST_FIXED_RATE_NONE (0xff) +#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE /** slot time long */ #define WMI_HOST_VDEV_SLOT_TIME_LONG 0x1 /** slot time short */ #define WMI_HOST_VDEV_SLOT_TIME_SHORT 0x2 +#endif + /** preablbe long */ #define WMI_HOST_VDEV_PREAMBLE_LONG 0x1 /** preablbe short */