Browse Source

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
Dustin Brown 6 years ago
parent
commit
686d3030e2

+ 1 - 1
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;

+ 2 - 2
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

+ 3 - 3
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;
 }

+ 1 - 1
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 ||