From 861dd4f7ce3a5a13b338d296df0c1102b0b7528c Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Tue, 24 Oct 2017 10:10:40 -0700 Subject: [PATCH] qcacld-3.0: Rename hdd_stats ClassA_stat field Per the Linux coding style "mixed-case names are frowned upon" so rename field ClassA_stat in struct hdd_stats. Change-Id: I33c773b08767e733d69c0dd843f64edc3c00fbee CRs-Fixed: 2131838 --- core/hdd/inc/wlan_hdd_main.h | 4 ++-- core/hdd/src/wlan_hdd_power.c | 4 ++-- core/hdd/src/wlan_hdd_stats.c | 10 +++++----- core/hdd/src/wlan_hdd_wext.c | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 77134ab0286a..611bc3b05efc 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -487,7 +487,7 @@ struct hdd_arp_stats_s { /** * struct hdd_stats - per-adapter statistics * @summary_stat: Summary stats reported by firmware - * @ClassA_stat: "Class A" stats reported by firmware + * @class_a_stat: "Class A" stats reported by firmware * @ClassD_stat: "Class D" stats reported by firmware * @per_chain_rssi_stats: Per-chain RSSI stats * @tx_rx_stats: Tx & Rx stats @@ -495,7 +495,7 @@ struct hdd_arp_stats_s { */ struct hdd_stats { tCsrSummaryStatsInfo summary_stat; - tCsrGlobalClassAStatsInfo ClassA_stat; + tCsrGlobalClassAStatsInfo class_a_stat; tCsrGlobalClassDStatsInfo ClassD_stat; struct csr_per_chain_rssi_stats_info per_chain_rssi_stats; struct hdd_tx_rx_stats tx_rx_stats; diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index e95eac9035f4..3c4140815bb4 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -2214,7 +2214,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy, mutex_unlock(&hdd_ctx->iface_change_lock); hdd_debug("Driver Module not enabled return success"); /* Send cached data to upperlayer*/ - *dbm = adapter->hdd_stats.ClassA_stat.max_pwr; + *dbm = adapter->hdd_stats.class_a_stat.max_pwr; return 0; } mutex_unlock(&hdd_ctx->iface_change_lock); @@ -2230,7 +2230,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy, TRACE_CODE_HDD_CFG80211_GET_TXPOWER, adapter->sessionId, adapter->device_mode)); wlan_hdd_get_class_astats(adapter); - *dbm = adapter->hdd_stats.ClassA_stat.max_pwr; + *dbm = adapter->hdd_stats.class_a_stat.max_pwr; EXIT(); return 0; diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 6fca5d98d902..79813debd78d 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -3989,13 +3989,13 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, */ hdd_lpass_notify_connect(adapter); - rate_flags = adapter->hdd_stats.ClassA_stat.tx_rate_flags; - mcs_index = adapter->hdd_stats.ClassA_stat.mcs_index; + rate_flags = adapter->hdd_stats.class_a_stat.tx_rate_flags; + mcs_index = adapter->hdd_stats.class_a_stat.mcs_index; /* convert to the UI units of 100kbps */ - myRate = adapter->hdd_stats.ClassA_stat.tx_rate * 5; + myRate = adapter->hdd_stats.class_a_stat.tx_rate * 5; if (!(rate_flags & eHAL_TX_RATE_LEGACY)) { - nss = adapter->hdd_stats.ClassA_stat.nss; + nss = adapter->hdd_stats.class_a_stat.nss; if ((nss > 1) && policy_mgr_is_current_hwmode_dbs(hdd_ctx->hdd_psoc) && !policy_mgr_is_hw_dbs_2x2_capable(hdd_ctx->hdd_psoc)) { @@ -4010,7 +4010,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, rate_flags = eHAL_TX_RATE_LEGACY; else rate_flags = - adapter->hdd_stats.ClassA_stat.mcs_rate_flags; + adapter->hdd_stats.class_a_stat.mcs_rate_flags; } if (mcs_index == INVALID_MCS_IDX) diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 357e60bbcaf5..2551e5216285 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -4121,8 +4121,8 @@ static void hdd_statistics_cb(void *pStats, void *pContext) */ qdf_mem_copy(&pStatsCache->summary_stat, pSummaryStats, sizeof(pStatsCache->summary_stat)); - qdf_mem_copy(&pStatsCache->ClassA_stat, pClassAStats, - sizeof(pStatsCache->ClassA_stat)); + qdf_mem_copy(&pStatsCache->class_a_stat, pClassAStats, + sizeof(pStatsCache->class_a_stat)); qdf_mem_copy(&pStatsCache->ClassD_stat, pClassDStats, sizeof(pStatsCache->ClassD_stat)); } @@ -4890,7 +4890,7 @@ QDF_STATUS wlan_hdd_get_class_astats(struct hdd_adapter *adapter) /* update the adapter with the fresh results */ priv = hdd_request_priv(request); - adapter->hdd_stats.ClassA_stat = priv->class_a_stats; + adapter->hdd_stats.class_a_stat = priv->class_a_stats; return_cached_results: /* @@ -5008,7 +5008,7 @@ QDF_STATUS wlan_hdd_get_station_stats(struct hdd_adapter *adapter) /* update the adapter with the fresh results */ priv = hdd_request_priv(request); adapter->hdd_stats.summary_stat = priv->summary_stats; - adapter->hdd_stats.ClassA_stat = priv->class_a_stats; + adapter->hdd_stats.class_a_stat = priv->class_a_stats; adapter->hdd_stats.per_chain_rssi_stats = priv->per_chain_rssi_stats; put_request: @@ -9894,7 +9894,7 @@ static int __iw_get_statistics(struct net_device *dev, char *p = extra; int tlen = 0; tCsrSummaryStatsInfo *pStats = &(adapter->hdd_stats.summary_stat); - tCsrGlobalClassAStatsInfo *aStats = &(adapter->hdd_stats.ClassA_stat); + tCsrGlobalClassAStatsInfo *aStats = &(adapter->hdd_stats.class_a_stat); tCsrGlobalClassDStatsInfo *dStats = &(adapter->hdd_stats.ClassD_stat); int ret;