From dc179f4e86242c3fd0873bb2fbc00c5c61c94f34 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 21 Oct 2017 11:27:26 -0700 Subject: [PATCH] qcacld-3.0: Fix camelCase issues with struct hdd_pmf_stats Both fields within struct hdd_pmf_stats are currently defined with camelCase. Rename these to align with the Linux coding style which states "mixed-case names are frowned upon." Change-Id: Ib701404a07c3c42fdecbe56f8baafece849fa616 CRs-Fixed: 2130440 --- core/hdd/inc/wlan_hdd_main.h | 12 ++++++------ core/hdd/src/wlan_hdd_assoc.c | 8 ++++---- core/hdd/src/wlan_hdd_wext.c | 8 ++++---- 3 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 903b75d5e309..b9ae53ee699e 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -461,12 +461,12 @@ struct hdd_tx_rx_stats { #ifdef WLAN_FEATURE_11W /** * struct hdd_pmf_stats - Protected Management Frame statistics - * @numUnprotDeauthRx: Number of unprotected deauth frames received - * @numUnprotDisassocRx: Number of unprotected disassoc frames received + * @num_unprot_deauth_rx: Number of unprotected deauth frames received + * @num_unprot_disassoc_rx: Number of unprotected disassoc frames received */ struct hdd_pmf_stats { - uint8_t numUnprotDeauthRx; - uint8_t numUnprotDisassocRx; + uint8_t num_unprot_deauth_rx; + uint8_t num_unprot_disassoc_rx; }; #endif @@ -491,7 +491,7 @@ struct hdd_arp_stats_s { * @ClassD_stat: "Class D" stats reported by firmware * @per_chain_rssi_stats: Per-chain RSSI stats * @tx_rx_stats: Tx & Rx stats - * @hddPmfStats: Protected Management Frame stats + * @hdd_pmf_stats: Protected Management Frame stats */ struct hdd_stats { tCsrSummaryStatsInfo summary_stat; @@ -501,7 +501,7 @@ struct hdd_stats { struct hdd_tx_rx_stats tx_rx_stats; struct hdd_arp_stats_s hdd_arp_stats; #ifdef WLAN_FEATURE_11W - struct hdd_pmf_stats hddPmfStats; + struct hdd_pmf_stats hdd_pmf_stats; #endif }; diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 8f2f297bbf21..d5aab39dea72 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -3104,8 +3104,8 @@ hdd_association_completion_handler(struct hdd_adapter *adapter, qdf_status, qdf_status); } #ifdef WLAN_FEATURE_11W - qdf_mem_zero(&adapter->hdd_stats.hddPmfStats, - sizeof(adapter->hdd_stats.hddPmfStats)); + qdf_mem_zero(&adapter->hdd_stats.hdd_pmf_stats, + sizeof(adapter->hdd_stats.hdd_pmf_stats)); #endif } else { bool connect_timeout = false; @@ -3883,7 +3883,7 @@ hdd_indicate_unprot_mgmt_frame(struct hdd_adapter *adapter, cfg80211_send_unprot_disassoc(adapter->dev, pbFrames, nFrameLength); #endif - adapter->hdd_stats.hddPmfStats.numUnprotDisassocRx++; + adapter->hdd_stats.hdd_pmf_stats.num_unprot_disassoc_rx++; } else if (type == SIR_MAC_MGMT_FRAME && subType == SIR_MAC_MGMT_DEAUTH) { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) @@ -3893,7 +3893,7 @@ hdd_indicate_unprot_mgmt_frame(struct hdd_adapter *adapter, cfg80211_send_unprot_deauth(adapter->dev, pbFrames, nFrameLength); #endif - adapter->hdd_stats.hddPmfStats.numUnprotDeauthRx++; + adapter->hdd_stats.hdd_pmf_stats.num_unprot_deauth_rx++; } else { hdd_warn("Frame type %d and subtype %d are not valid", type, subType); diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index abd2c8c9b22d..27143fb34ce1 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -8143,10 +8143,10 @@ static int __iw_get_char_setnone(struct net_device *dev, pWextState->roamProfile.BSSIDs.bssid->bytes[4], pWextState->roamProfile.BSSIDs.bssid->bytes[5], pWextState->roamProfile.MFPEnabled, - adapter->hdd_stats.hddPmfStats. - numUnprotDisassocRx, - adapter->hdd_stats.hddPmfStats. - numUnprotDeauthRx); + adapter->hdd_stats.hdd_pmf_stats. + num_unprot_disassoc_rx, + adapter->hdd_stats.hdd_pmf_stats. + num_unprot_deauth_rx); wrqu->data.length = strlen(extra) + 1; break;