qcacld-3.0: Replace typedef tSirQosMapSet

The Linux Coding Style enumerates a few special cases where typedefs
are useful, but stresses "NEVER EVER use a typedef unless you can
clearly match one of those rules." The tSirQosMapSet typedef does not
meet any of those criteria, so replace it (and the "tp" variant) with
a reference to the underlying struct.

Further note the Linux Coding Style frowns upon mixed-case names and
so-called Hungarian notation, so in conjunction rename the underlying
struct to be in compliance.

Change-Id: I415ee669362b71b72788f8068cbf2385470ef216
CRs-Fixed: 2396055
This commit is contained in:
Jeff Johnson
2019-02-06 11:28:12 -08:00
committed by nshrivas
parent 57a2e6f9b6
commit 7fb55e58ee
7 changed files with 16 additions and 13 deletions

View File

@@ -1679,12 +1679,12 @@ typedef struct sSirAggrQosRsp {
} tSirAggrQosRsp, *tpSirAggrQosRsp; } tSirAggrQosRsp, *tpSirAggrQosRsp;
typedef struct sSirQosMapSet { struct qos_map_set {
uint8_t present; uint8_t present;
uint8_t num_dscp_exceptions; uint8_t num_dscp_exceptions;
uint8_t dscp_exceptions[21][2]; uint8_t dscp_exceptions[21][2];
uint8_t dscp_range[8][2]; uint8_t dscp_range[8][2];
} tSirQosMapSet, *tpSirQosMapSet; };
typedef struct sSmeIbssPeerInd { typedef struct sSmeIbssPeerInd {
uint16_t mesgType; uint16_t mesgType;

View File

@@ -400,7 +400,7 @@ typedef struct sSirAssocRsp {
tDot11fIEVHTCaps VHTCaps; tDot11fIEVHTCaps VHTCaps;
tDot11fIEVHTOperation VHTOperation; tDot11fIEVHTOperation VHTOperation;
tDot11fIEExtCap ExtCap; tDot11fIEExtCap ExtCap;
tSirQosMapSet QosMapSet; struct qos_map_set QosMapSet;
#ifdef WLAN_FEATURE_11W #ifdef WLAN_FEATURE_11W
tDot11fIETimeoutInterval TimeoutInterval; tDot11fIETimeoutInterval TimeoutInterval;
#endif #endif
@@ -625,7 +625,7 @@ sir_convert_delts_req2_struct(struct mac_context *mac,
QDF_STATUS QDF_STATUS
sir_convert_qos_map_configure_frame2_struct(struct mac_context *mac, sir_convert_qos_map_configure_frame2_struct(struct mac_context *mac,
uint8_t *pFrame, uint32_t nFrame, uint8_t *pFrame, uint32_t nFrame,
tSirQosMapSet *pQosMapSet); struct qos_map_set *pQosMapSet);
#ifdef ANI_SUPPORT_11H #ifdef ANI_SUPPORT_11H
QDF_STATUS QDF_STATUS

View File

@@ -450,7 +450,7 @@ struct pe_session {
uint16_t schBeaconOffsetEnd; uint16_t schBeaconOffsetEnd;
bool isOSENConnection; bool isOSENConnection;
/* DSCP to UP mapping for HS 2.0 */ /* DSCP to UP mapping for HS 2.0 */
tSirQosMapSet QosMapSet; struct qos_map_set QosMapSet;
#ifdef WLAN_FEATURE_ROAM_OFFLOAD #ifdef WLAN_FEATURE_ROAM_OFFLOAD
bool bRoamSynchInProgress; bool bRoamSynchInProgress;

View File

@@ -838,9 +838,11 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
if (assoc_rsp->QosMapSet.present) if (assoc_rsp->QosMapSet.present)
qdf_mem_copy(&session_entry->QosMapSet, qdf_mem_copy(&session_entry->QosMapSet,
&assoc_rsp->QosMapSet, sizeof(tSirQosMapSet)); &assoc_rsp->QosMapSet,
sizeof(struct qos_map_set));
else else
qdf_mem_zero(&session_entry->QosMapSet, sizeof(tSirQosMapSet)); qdf_mem_zero(&session_entry->QosMapSet,
sizeof(struct qos_map_set));
if (assoc_rsp->obss_scanparams.present) if (assoc_rsp->obss_scanparams.present)
lim_update_obss_scanparams(session_entry, lim_update_obss_scanparams(session_entry,

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -89,7 +89,7 @@ QDF_STATUS convert_p2p_opaque(struct mac_context *, tSirAddie *,
QDF_STATUS convert_wfd_opaque(struct mac_context *, tSirAddie *, QDF_STATUS convert_wfd_opaque(struct mac_context *, tSirAddie *,
tDot11fIEWFDIEOpaque *); tDot11fIEWFDIEOpaque *);
#endif #endif
void convert_qos_mapset_frame(struct mac_context *, tSirQosMapSet *, void convert_qos_mapset_frame(struct mac_context *, struct qos_map_set *,
tDot11fIEQosMapSet *); tDot11fIEQosMapSet *);
#endif #endif

View File

@@ -805,7 +805,8 @@ static void lim_log_operating_mode(struct mac_context *mac,
#endif /* DUMP_MGMT_CNTNTS */ #endif /* DUMP_MGMT_CNTNTS */
} }
static void lim_log_qos_map_set(struct mac_context *mac, tSirQosMapSet *pQosMapSet) static void lim_log_qos_map_set(struct mac_context *mac,
struct qos_map_set *pQosMapSet)
{ {
uint8_t i; uint8_t i;
@@ -4502,7 +4503,7 @@ QDF_STATUS
sir_convert_qos_map_configure_frame2_struct(struct mac_context *mac, sir_convert_qos_map_configure_frame2_struct(struct mac_context *mac,
uint8_t *pFrame, uint8_t *pFrame,
uint32_t nFrame, uint32_t nFrame,
tSirQosMapSet *pQosMapSet) struct qos_map_set *pQosMapSet)
{ {
tDot11fQosMapConfigure mapConfigure; tDot11fQosMapConfigure mapConfigure;
uint32_t status; uint32_t status;

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -650,7 +650,7 @@ void convert_wmm_schedule(struct mac_context *mac,
pOld->specInterval = pNew->spec_interval; pOld->specInterval = pNew->spec_interval;
} }
void convert_qos_mapset_frame(struct mac_context *mac, tSirQosMapSet *Qos, void convert_qos_mapset_frame(struct mac_context *mac, struct qos_map_set *Qos,
tDot11fIEQosMapSet *dot11fIE) tDot11fIEQosMapSet *dot11fIE)
{ {
uint8_t i, j = 0; uint8_t i, j = 0;