From 686d3030e28b6248a32fb1aafdb698ac6d29ff0b Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Wed, 17 Oct 2018 16:58:50 -0700 Subject: [PATCH] qcacld-3.0: Change dot11p_mode to enumerated type dot11p_mode is currently represented with a uint8_t type, despite an appropriate enumerated type being available. Change the field's type to the more restrictive 'enum dot11p_mode' instead of uint8_t. Change-Id: I847ce0901297b0a3e4312e8ce4124a886320f174 CRs-Fixed: 2335575 --- components/mlme/dispatcher/inc/wlan_mlme_public_struct.h | 2 +- components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h | 4 ++-- components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c | 6 +++--- core/hdd/src/wlan_hdd_main.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h index 0e2230b3fe78..109003922a01 100644 --- a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h +++ b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h @@ -841,7 +841,7 @@ struct wlan_mlme_sta_cfg { uint32_t tgt_gtx_usr_cfg; uint32_t pmkid_modes; uint32_t wait_cnf_timeout; - uint8_t dot11p_mode; + enum dot11p_mode dot11p_mode; uint8_t fils_max_chan_guard_time; uint8_t current_rssi; bool ignore_peer_erp_info; diff --git a/components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h b/components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h index c32ca23a8991..387624343acf 100644 --- a/components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h +++ b/components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h @@ -616,13 +616,13 @@ ucfg_mlme_set_pmkid_modes(struct wlan_objmgr_psoc *psoc, /** * ucfg_mlme_get_dot11p_mode() - Get the setting about 802.11p mode * @psoc: pointer to psoc object - * @val: Pointer to the value which will be filled for the caller + * @out_mode: Pointer to the mode which will be filled for the caller * * Return: QDF Status */ QDF_STATUS ucfg_mlme_get_dot11p_mode(struct wlan_objmgr_psoc *psoc, - uint8_t *val); + enum dot11p_mode *out_mode); /** * ucfg_mlme_get_go_cts2self_for_sta() - Stop NOA and start using cts2self diff --git a/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c b/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c index b257cb2f3d3e..6d4115ed17cd 100644 --- a/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c +++ b/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c @@ -176,18 +176,18 @@ ucfg_mlme_set_pmkid_modes(struct wlan_objmgr_psoc *psoc, QDF_STATUS ucfg_mlme_get_dot11p_mode(struct wlan_objmgr_psoc *psoc, - uint8_t *val) + enum dot11p_mode *out_mode) { struct wlan_mlme_psoc_obj *mlme_obj; mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { - *val = cfg_default(CFG_DOT11P_MODE); + *out_mode = cfg_default(CFG_DOT11P_MODE); mlme_err("mlme obj null"); return QDF_STATUS_E_INVAL; } - *val = mlme_obj->cfg.sta.dot11p_mode; + *out_mode = mlme_obj->cfg.sta.dot11p_mode; return QDF_STATUS_SUCCESS; } diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 6d4edf863204..48c864b4b554 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -9350,7 +9350,7 @@ static int hdd_open_interfaces(struct hdd_context *hdd_ctx, bool rtnl_held) { struct hdd_adapter *adapter; int ret; - uint8_t dot11p_mode; + enum dot11p_mode dot11p_mode; /* open monitor mode adapter if con_mode is monitor mode */ if (con_mode == QDF_GLOBAL_MONITOR_MODE ||