From 9a5863f4d3a6174db8e09ba443a764655a177560 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 21 Oct 2017 13:39:57 -0700 Subject: [PATCH] qcacld-3.0: Rename hdd_station_info tlSTAState field Per the Linux coding style "mixed-case names are frowned upon" so rename field tlSTAState in struct hdd_station_info. Change-Id: I8742b42144ed455213eef92426356c54b08e2038 CRs-Fixed: 2131087 --- core/hdd/inc/wlan_hdd_main.h | 4 ++-- core/hdd/src/wlan_hdd_main.c | 2 +- core/hdd/src/wlan_hdd_softap_tx_rx.c | 12 ++++++------ core/hdd/src/wlan_hdd_wext.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 507cfb2cb124..49039763b298 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -774,7 +774,7 @@ struct hdd_fw_txrx_stats { * Broadcast uses station ID zero by default. * @staType: Type of station i.e. p2p client or infrastructure station * @macAddrSTA: MAC address of the station - * @tlSTAState: Current Station state so HDD knows how to deal with packet + * @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_deauth_in_progress: The station entry for which Deauth is in progress @@ -807,7 +807,7 @@ struct hdd_station_info { uint8_t ucSTAId; eStationType staType; struct qdf_mac_addr macAddrSTA; - enum ol_txrx_peer_state tlSTAState; + enum ol_txrx_peer_state peer_state; bool isQosEnabled; bool is_deauth_in_progress; uint8_t nss; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index c754f4873f6d..61fca11f9fe0 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -12419,7 +12419,7 @@ bool hdd_is_connection_in_progress(uint8_t *session_id, sta_id++) { if (!((adapter->aStaInfo[sta_id].in_use) && (OL_TXRX_PEER_STATE_CONN == - adapter->aStaInfo[sta_id].tlSTAState))) + adapter->aStaInfo[sta_id].peer_state))) continue; sta_mac = (uint8_t *) diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index aa1c1bac9560..7c6cbb44532f 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -370,15 +370,15 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb, } if ((OL_TXRX_PEER_STATE_CONN != - adapter->aStaInfo[STAId].tlSTAState) + adapter->aStaInfo[STAId].peer_state) && (OL_TXRX_PEER_STATE_AUTH != - adapter->aStaInfo[STAId].tlSTAState)) { + adapter->aStaInfo[STAId].peer_state)) { QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Station not connected yet", __func__); goto drop_pkt; } else if (OL_TXRX_PEER_STATE_CONN == - adapter->aStaInfo[STAId].tlSTAState) { + adapter->aStaInfo[STAId].peer_state) { if (ntohs(skb->protocol) != HDD_ETHERTYPE_802_1_X) { QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO_HIGH, @@ -980,7 +980,7 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter, qdf_status = hdd_change_peer_state(adapter, staDesc.sta_id, OL_TXRX_PEER_STATE_AUTH, false); - adapter->aStaInfo[staId].tlSTAState = OL_TXRX_PEER_STATE_AUTH; + adapter->aStaInfo[staId].peer_state = OL_TXRX_PEER_STATE_AUTH; adapter->sessionCtx.ap.uIsAuthenticated = true; } else { @@ -989,7 +989,7 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter, qdf_status = hdd_change_peer_state(adapter, staDesc.sta_id, OL_TXRX_PEER_STATE_CONN, false); - adapter->aStaInfo[staId].tlSTAState = OL_TXRX_PEER_STATE_CONN; + adapter->aStaInfo[staId].peer_state = OL_TXRX_PEER_STATE_CONN; adapter->sessionCtx.ap.uIsAuthenticated = false; @@ -1122,7 +1122,7 @@ QDF_STATUS hdd_softap_change_sta_state(struct hdd_adapter *adapter, hdd_info("Station %u changed to state %d", ucSTAId, state); if (QDF_STATUS_SUCCESS == qdf_status) { - adapter->aStaInfo[ucSTAId].tlSTAState = + adapter->aStaInfo[ucSTAId].peer_state = OL_TXRX_PEER_STATE_AUTH; p2p_peer_authorized(adapter->hdd_vdev, pDestMacAddress->bytes); } diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index f6defe3f764d..59b8aed4a413 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -4492,7 +4492,7 @@ int hdd_set_peer_rate(struct hdd_adapter *adapter, int set_value) hdd_get_aid_rc(&aid, &rc, set_value); if ((adapter->aStaInfo[aid].in_use) && - (OL_TXRX_PEER_STATE_CONN == adapter->aStaInfo[aid].tlSTAState)) { + (OL_TXRX_PEER_STATE_CONN == adapter->aStaInfo[aid].peer_state)) { peer_mac = (uint8_t *)&(adapter->aStaInfo[aid].macAddrSTA.bytes[0]); hdd_info("Peer AID: %d MAC_ADDR: "MAC_ADDRESS_STR,