samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Förgrening 0
Kod Ärenden Pull-förfrågningar Actions Packages Projekt Släpp Wiki Aktiviteter

qcacld-3.0: Replace typedef tSirWifiPeerStat

Bläddra i källkod 
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 tSirWifiPeerStat typedef does
not meet any of those criteria, so replace it (and the "tp" variant)
with a properly named struct.

In addition the Linux Coding Style frowns upon mixed-case names so
rename the members which are currently not compliant.

Change-Id: I337e2329d544e0b6daf6650f826e736f2492ef30
CRs-Fixed: 2427168
This commit is contained in:
Jeff Johnson
2019-03-28 14:34:01 -07:00
committad av nshrivas
förälder 1049503cbf
incheckning fcb078d1e3
4 ändrade filer med 42 tillägg och 40 borttagningar
Download Patch File Download Diff File Expand all files Collapse all files

12
core/hdd/src/wlan_hdd_debugfs_llstat.c
Visa fil

@@ -154,7 +154,7 @@ void hdd_debugfs_process_iface_stats(struct hdd_adapter *adapter,
void hdd_debugfs_process_peer_stats(struct hdd_adapter *adapter, void *data)
{
tpSirWifiPeerStat peer_stat;
struct wifi_peer_stat *peer_stat;
struct wifi_peer_info *peer_info;
struct wifi_rate_stat *rate_stat;
int i, j, num_rate;
@@ -170,16 +170,16 @@ void hdd_debugfs_process_peer_stats(struct hdd_adapter *adapter, void *data)
return;
}
peer_stat = (tpSirWifiPeerStat) data;
peer_stat = data;
buffer = ll_stats.result;
buffer += ll_stats.len;
len = scnprintf(buffer, DEBUGFS_LLSTATS_BUF_SIZE - ll_stats.len,
"\n\n===LL_STATS_PEER_ALL : num_peers %u===",
peer_stat->numPeers);
peer_stat->num_peers);
peer_info = (struct wifi_peer_info *) ((uint8_t *) peer_stat->peerInfo);
for (i = 1; i <= peer_stat->numPeers; i++) {
peer_info = peer_stat->peer_info;
for (i = 1; i <= peer_stat->num_peers; i++) {
buffer += len;
ll_stats.len += len;
len = scnprintf(buffer,
@@ -205,7 +205,7 @@ void hdd_debugfs_process_peer_stats(struct hdd_adapter *adapter, void *data)
rate_stat->retries_long);
}
peer_info = (struct wifi_peer_info *) ((uint8_t *)
peer_stat->peerInfo + (i *
peer_stat->peer_info + (i *
sizeof(struct wifi_peer_info)) +
(num_rate * sizeof(struct wifi_rate_stat)));
}

41
core/hdd/src/wlan_hdd_stats.c
Visa fil

@@ -616,10 +616,10 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
*/
static void hdd_link_layer_process_peer_stats(struct hdd_adapter *adapter,
u32 more_data,
tpSirWifiPeerStat pData)
struct wifi_peer_stat *pData)
{
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
tpSirWifiPeerStat peer_stat;
struct wifi_peer_stat *peer_stat;
struct wifi_peer_info *peer_info;
struct sk_buff *vendor_event;
int status, i;
@@ -634,8 +634,8 @@ static void hdd_link_layer_process_peer_stats(struct hdd_adapter *adapter,
if (0 != status)
return;
hdd_debug("LL_STATS_PEER_ALL : numPeers %u, more data = %u",
peer_stat->numPeers, more_data);
hdd_debug("LL_STATS_PEER_ALL : num_peers %u, more data = %u",
peer_stat->num_peers, more_data);
/*
* Allocate a size of 4096 for the peer stats comprising
@@ -661,7 +661,7 @@ static void hdd_link_layer_process_peer_stats(struct hdd_adapter *adapter,
more_data) ||
nla_put_u32(vendor_event,
QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_NUM_PEERS,
peer_stat->numPeers)) {
peer_stat->num_peers)) {
hdd_err("QCA_WLAN_VENDOR_ATTR put fail");
kfree_skb(vendor_event);
@@ -669,20 +669,20 @@ static void hdd_link_layer_process_peer_stats(struct hdd_adapter *adapter,
}
peer_info = (struct wifi_peer_info *) ((uint8_t *)
peer_stat->peerInfo);
peer_stat->peer_info);
if (peer_stat->numPeers) {
struct nlattr *peerInfo;
if (peer_stat->num_peers) {
struct nlattr *peer_nest;
peerInfo = nla_nest_start(vendor_event,
QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO);
if (!peerInfo) {
peer_nest = nla_nest_start(vendor_event,
QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO);
if (!peer_nest) {
hdd_err("nla_nest_start failed");
kfree_skb(vendor_event);
return;
}
for (i = 1; i <= peer_stat->numPeers; i++) {
for (i = 1; i <= peer_stat->num_peers; i++) {
peers = nla_nest_start(vendor_event, i);
if (!peers) {
hdd_err("nla_nest_start failed");
@@ -699,12 +699,12 @@ static void hdd_link_layer_process_peer_stats(struct hdd_adapter *adapter,
}
peer_info = (struct wifi_peer_info *)
((uint8_t *)peer_stat->peerInfo +
((uint8_t *)peer_stat->peer_info +
(i * sizeof(struct wifi_peer_info)) +
(num_rate * sizeof(struct wifi_rate_stat)));
nla_nest_end(vendor_event, peers);
}
nla_nest_end(vendor_event, peerInfo);
nla_nest_end(vendor_event, peer_nest);
}
cfg80211_vendor_cmd_reply(vendor_event);
@@ -1077,8 +1077,7 @@ static void hdd_ll_process_peer_stats(struct hdd_adapter *adapter,
if (DEBUGFS_LLSTATS_REQID == resp_id)
hdd_debugfs_process_peer_stats(adapter, data);
else
hdd_link_layer_process_peer_stats(adapter, more_data,
(tpSirWifiPeerStat) data);
hdd_link_layer_process_peer_stats(adapter, more_data, data);
}
void wlan_hdd_cfg80211_link_layer_stats_callback(hdd_handle_t hdd_handle,
@@ -1780,7 +1779,7 @@ hdd_populate_per_peer_ps_info(struct wifi_peer_info *wifi_peer_info,
*
* Return: 0 success
*/
static int hdd_populate_wifi_peer_ps_info(tSirWifiPeerStat *data,
static int hdd_populate_wifi_peer_ps_info(struct wifi_peer_stat *data,
struct sk_buff *vendor_event)
{
uint32_t peer_num, i;
@@ -1792,7 +1791,7 @@ static int hdd_populate_wifi_peer_ps_info(tSirWifiPeerStat *data,
return -EINVAL;
}
peer_num = data->numPeers;
peer_num = data->num_peers;
if (peer_num == 0) {
hdd_err("Peer number is zero.");
return -EINVAL;
@@ -1813,7 +1812,7 @@ static int hdd_populate_wifi_peer_ps_info(tSirWifiPeerStat *data,
}
for (i = 0; i < peer_num; i++) {
wifi_peer_info = &data->peerInfo[i];
wifi_peer_info = &data->peer_info[i];
peers = nla_nest_start(vendor_event, i);
if (!peers) {
@@ -2327,7 +2326,7 @@ void wlan_hdd_cfg80211_link_layer_stats_ext_callback(hdd_handle_t ctx,
uint32_t param_id, index;
struct hdd_adapter *adapter = NULL;
tSirLLStatsResults *linkLayer_stats_results;
tSirWifiPeerStat *peer_stats;
struct wifi_peer_stat *peer_stats;
uint8_t *results;
int status;
@@ -2370,7 +2369,7 @@ void wlan_hdd_cfg80211_link_layer_stats_ext_callback(hdd_handle_t ctx,
linkLayer_stats_results->ifaceId,
linkLayer_stats_results->results);
if (param_id & WMI_LL_STATS_EXT_PS_CHG) {
peer_stats = (tSirWifiPeerStat *)results;
peer_stats = (struct wifi_peer_stat *)results;
status = hdd_populate_wifi_peer_ps_info(peer_stats, skb);
} else if (param_id & WMI_LL_STATS_EXT_TX_FAIL) {
struct sir_wifi_iface_tx_fail *tx_fail;

19
core/mac/inc/sir_api.h
Visa fil

@@ -3744,15 +3744,18 @@ typedef struct {
wmi_iface_offload_stats offload_stats[WMI_OFFLOAD_STATS_TYPE_MAX];
} tSirWifiIfaceStat, *tpSirWifiIfaceStat;
/* Peer statistics - corresponding to 3rd most LSB in
* wifi statistics bitmap for getting statistics
/**
* struct wifi_peer_stat - peer statistics
* @num_peers: number of peers
* @peer_info: per peer statistics
*
* Peer statistics - corresponding to 3rd most LSB in
* wifi statistics bitmap for getting statistics
*/
typedef struct {
/* number of peers */
uint32_t numPeers;
/* per peer statistics */
struct wifi_peer_info peerInfo[0];
} tSirWifiPeerStat, *tpSirWifiPeerStat;
struct wifi_peer_stat {
uint32_t num_peers;
struct wifi_peer_info peer_info[0];
};
/* wifi statistics bitmap for getting statistics */
#define WMI_LINK_STATS_RADIO 0x00000001

10
core/wma/src/wma_utils.c
Visa fil

@@ -1392,7 +1392,7 @@ static int wma_unified_link_peer_stats_event_handler(void *handle,
return -EINVAL;
}
peer_stats_size = sizeof(tSirWifiPeerStat);
peer_stats_size = sizeof(struct wifi_peer_stat);
peer_info_size = sizeof(struct wifi_peer_info);
rate_stats_size = sizeof(struct wifi_rate_stat);
link_stats_results_size =
@@ -1891,7 +1891,7 @@ static int wma_peer_ps_evt_handler(void *handle, u_int8_t *event,
{
WMI_PEER_STA_PS_STATECHG_EVENTID_param_tlvs *param_buf;
wmi_peer_sta_ps_statechange_event_fixed_param *fixed_param;
tSirWifiPeerStat *peer_stat;
struct wifi_peer_stat *peer_stat;
struct wifi_peer_info *peer_info;
tSirLLStatsResults *link_stats_results;
tSirMacAddr mac_address;
@@ -1917,7 +1917,7 @@ static int wma_peer_ps_evt_handler(void *handle, u_int8_t *event,
fixed_param = param_buf->fixed_param;
result_len = sizeof(tSirLLStatsResults) +
sizeof(tSirWifiPeerStat) +
sizeof(struct wifi_peer_stat) +
sizeof(struct wifi_peer_info);
link_stats_results = qdf_mem_malloc(result_len);
if (!link_stats_results)
@@ -1936,9 +1936,9 @@ static int wma_peer_ps_evt_handler(void *handle, u_int8_t *event,
link_stats_results->peer_event_number = 1;
link_stats_results->moreResultToFollow = 0;
peer_stat = (tSirWifiPeerStat *)link_stats_results->results;
peer_stat = (struct wifi_peer_stat *)link_stats_results->results;
peer_stat->numPeers = 1;
peer_info = (struct wifi_peer_info *)peer_stat->peerInfo;
peer_info = (struct wifi_peer_info *)peer_stat->peer_info;
qdf_mem_copy(&peer_info->peer_macaddr,
&mac_address,
sizeof(tSirMacAddr));