From 65fda1155b58cbe148a04919f21dc5b3a4c8c90c Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 21 Oct 2017 13:46:10 -0700 Subject: [PATCH] qcacld-3.0: Rename hdd_station_info isQosEnabled field Per the Linux coding style "mixed-case names are frowned upon" so rename field isQosEnabled in struct hdd_station_info. Change-Id: I0e8ba829be981faa339c7ad6ccebdb7f8194ae17 CRs-Fixed: 2131089 --- core/hdd/inc/wlan_hdd_main.h | 4 ++-- core/hdd/src/wlan_hdd_cfg80211.c | 6 +++--- core/hdd/src/wlan_hdd_hostapd.c | 2 +- core/hdd/src/wlan_hdd_softap_tx_rx.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 49039763b298..836edc5478e2 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -776,7 +776,7 @@ struct hdd_fw_txrx_stats { * @macAddrSTA: MAC address of the station * @peer_state: Current Station state so HDD knows how to deal with packet * queue. Most recent states used to change TLSHIM STA state. - * @isQosEnabled: Track QoS status of station + * @is_qos_enabled: Track QoS status of station * @is_deauth_in_progress: The station entry for which Deauth is in progress * @nss: Number of spatial streams supported * @rate_flags: Rate Flags for this connection @@ -808,7 +808,7 @@ struct hdd_station_info { eStationType staType; struct qdf_mac_addr macAddrSTA; enum ol_txrx_peer_state peer_state; - bool isQosEnabled; + bool is_qos_enabled; bool is_deauth_in_progress; uint8_t nss; uint32_t rate_flags; diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 60ec3a9b5f8b..a529428309a1 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -4874,7 +4874,7 @@ static int hdd_get_station_remote(struct hdd_context *hdd_ctx, (sizeof(stainfo->tx_bytes) + NLA_HDRLEN) + (sizeof(stainfo->rx_packets) + NLA_HDRLEN) + (sizeof(stainfo->rx_bytes) + NLA_HDRLEN) + - (sizeof(stainfo->isQosEnabled) + NLA_HDRLEN) + + (sizeof(stainfo->is_qos_enabled) + NLA_HDRLEN) + (sizeof(stainfo->mode) + NLA_HDRLEN); if (!hdd_ctx->config->sap_get_peer_info || @@ -4917,7 +4917,7 @@ static int hdd_get_station_remote(struct hdd_context *hdd_ctx, stainfo->ampdu, stainfo->tx_stbc, stainfo->rx_stbc); hdd_info("wmm %d chwidth %d sgi %d", - stainfo->isQosEnabled, + stainfo->is_qos_enabled, stainfo->ch_width, stainfo->sgi_enable); } @@ -4927,7 +4927,7 @@ static int hdd_get_station_remote(struct hdd_context *hdd_ctx, remote_station_put_u64(skb, REMOTE_TX_BYTES, stainfo->tx_bytes) || nla_put_u32(skb, REMOTE_RX_PACKETS, stainfo->rx_packets) || remote_station_put_u64(skb, REMOTE_RX_BYTES, stainfo->rx_bytes) || - nla_put_u8(skb, REMOTE_WMM, stainfo->isQosEnabled) || + nla_put_u8(skb, REMOTE_WMM, stainfo->is_qos_enabled) || nla_put_u8(skb, REMOTE_SUPPORTED_MODE, stainfo->mode)) { hdd_err("put fail"); goto fail; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 8397311f5688..0ee95c8b9656 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -1317,7 +1317,7 @@ static void hdd_fill_station_info(struct hdd_station_info *stainfo, stainfo->sgi_enable, stainfo->tx_stbc, stainfo->rx_stbc, - stainfo->isQosEnabled, + stainfo->is_qos_enabled, stainfo->ch_width, stainfo->mode, event->wmmEnabled, diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 7c6cbb44532f..73899fce9e3f 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -968,7 +968,7 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter, */ adapter->aStaInfo[staId].ucSTAId = staId; - adapter->aStaInfo[staId].isQosEnabled = fWmmEnabled; + adapter->aStaInfo[staId].is_qos_enabled = fWmmEnabled; if (!fAuthRequired) { hdd_info("open/shared auth StaId= %d. Changing TL state to AUTHENTICATED at Join time",