From cf3e7ff2b4eeab7113cbd82f07a462ced4f4add2 Mon Sep 17 00:00:00 2001 From: gbian Date: Thu, 16 Mar 2017 13:42:26 +0800 Subject: qcacld-2.0: Get actual rate from right source Change-Id: I118339e2fba88d7fbd90794620ceed1bf20265ae CRs-Fixed: 2020320 --- CORE/HDD/inc/wlan_hdd_main.h | 4 ---- CORE/HDD/src/wlan_hdd_cfg80211.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h index acc665e8c7f4..525dd9cedb53 100644 --- a/CORE/HDD/inc/wlan_hdd_main.h +++ b/CORE/HDD/inc/wlan_hdd_main.h @@ -990,8 +990,6 @@ struct hdd_rate_info { * @rx_bytes: bytes received from this station * @rx_retries: cumulative retry counts * @tx_failed: number of failed transmissions - * @last_tx_rate: last used tx bitrate (kbps) - * @last_rx_rate: last used rx bitrate (kbps) * @rssi: The signal strength (dbm) * @tx_rate: last used tx rate info * @rx_rate: last used rx rate info @@ -1005,8 +1003,6 @@ struct hdd_fw_txrx_stats { uint64_t rx_bytes; uint32_t tx_retries; uint32_t tx_failed; - uint32_t last_tx_rate; - uint32_t last_rx_rate; int8_t rssi; struct hdd_rate_info tx_rate; struct hdd_rate_info rx_rate; diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 3f23e1e5b80a..58c8b43db30a 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -24166,7 +24166,7 @@ static void hdd_fill_rate_info(struct station_info *sinfo, cfg->reportMaxLinkSpeed); /* convert to 100kbps expected in rate table */ - myrate = stats->last_tx_rate/100; + myrate = stats->tx_rate.rate/100; rate_flags = stainfo->rate_flags; if (!(rate_flags & eHAL_TX_RATE_LEGACY)) { nss = stainfo->nss; -- cgit v1.2.3