From patchwork Thu Oct 11 12:45:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anilkumar Kolli X-Patchwork-Id: 10636625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 494173CF1 for ; Thu, 11 Oct 2018 12:42:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4149F2B448 for ; Thu, 11 Oct 2018 12:42:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 356242B462; Thu, 11 Oct 2018 12:42:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C6B582B448 for ; Thu, 11 Oct 2018 12:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=De1DMfjXuQUxxCy8O37e6lqzojx1uhQfucxU1vtS/0M=; b=tT7v2M2Xfbi4AFFye7KZDu667T 09GjUInYDppYNL6yh8qYy70qaUMV71BGfl+0qs6VsAzOBldOh1q36TaaNsIrCP41D+MLF5CwkmKBl BeDCpUyjev1JPU6vKeILavTkhao1WijLWtlNQuS+Ai0e0uGh2p4BGUZnKBnDqCmrPvYymDEAz3kPv WyZqdmHYCKAiUxX98LuqCpWxhED9MAJzIQiND2n/EAprUMs6CPIA9QJBFhAJlhew32WQeHpJzyDZ/ LHlutuXuW7XTiyZzIW2D21dtgqKSTllNtYB0dGn/7xQYNcxJ+SbiY/guX2Pj6ZzFt6+zOvljaGRjQ DB0IMLjg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gAaI7-0000e7-Jm; Thu, 11 Oct 2018 12:42:11 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gAaI1-0000bd-79 for ath10k@lists.infradead.org; Thu, 11 Oct 2018 12:42:06 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 4926E60A98; Thu, 11 Oct 2018 12:42:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1539261723; bh=ps6xgvsCOJMtSFlyXdoXQe/bza0B8VVvKiSem0Zl4KM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eIrNsHgGJjdIFtlGy6cMqmDDa6KRE6bY8WZzh649yVhtZxvCprDo+dWpJ1SZSyUNV mRwNpUcUVmBle/dJYm3ThC29n89sm6NabdMILGceoGT6S9gmtFtB4X+yvE35YAOykn fDvBmA9nG1rpdcHnPyZZWcEiRT9blpuvg9qNT0wg= Received: from localhost (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: akolli@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 10EB56072E; Thu, 11 Oct 2018 12:42:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1539261722; bh=ps6xgvsCOJMtSFlyXdoXQe/bza0B8VVvKiSem0Zl4KM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kaNu7SYjLyAj6v4Z25ouQi3LTfL7o48YSCwZoba1P/suoTgMXP9pRFqctm7hIdl7I /xBWcV3B/qR740AzYuNnAYYv0ZEY9F+8PFq/+ulWMqktIy12YWNwRIXV5Z3pLbYiFk kL9F7iZW9axp3ZBW1hSzB9pCFSahteCRtpow2ASM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 10EB56072E Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=akolli@codeaurora.org From: Anilkumar Kolli To: ath10k@lists.infradead.org Subject: [PATCH 1/2] mac80211: implement ieee80211_tx_rate_update to update rate Date: Thu, 11 Oct 2018 18:15:03 +0530 Message-Id: <1539261904-9016-2-git-send-email-akolli@codeaurora.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1539261904-9016-1-git-send-email-akolli@codeaurora.org> References: <1539261904-9016-1-git-send-email-akolli@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181011_054205_308382_DD4EDC96 X-CRM114-Status: UNSURE ( 9.84 ) X-CRM114-Notice: Please train this message. X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anilkumar Kolli , linux-wireless@vger.kernel.org MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Current mac80211 has provision to update tx status through ieee80211_tx_status() and ieee80211_tx_status_ext(). But drivers like ath10k updates the tx status from the skb except txrate, txrate will be updated from a different path, peer stats. Using ieee80211_tx_status_ext() in two different paths - (one for the stats, one for the tx rate) will duplicate the stats. To avoid this stats duplication, ieee80211_tx_rate_update() is implemented. Signed-off-by: Anilkumar Kolli --- include/net/mac80211.h | 15 +++++++++++++++ net/mac80211/status.c | 22 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index c4fadbafbf21..86a6b1117a16 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -4352,6 +4352,21 @@ void ieee80211_sta_set_expected_throughput(struct ieee80211_sta *pubsta, u32 thr); /** + * ieee80211_tx_rate_update - transmit rate update callback + * + * Drivers should call this functions with a non-NULL pub sta + * This function can be used in drivers that does not have provision + * in updating the tx rate in data path. + * + * @hw: the hardware the frame was transmitted by + * @pubsta: the station to update the tx rate for. + * @info: tx status information + */ +void ieee80211_tx_rate_update(struct ieee80211_hw *hw, + struct ieee80211_sta *pubsta, + struct ieee80211_tx_info *info); + +/** * ieee80211_tx_status - transmit status callback * * Call this function for all transmitted frames after they have been diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 91d7c0cd1882..6272fe1b351d 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -987,6 +987,28 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw, } EXPORT_SYMBOL(ieee80211_tx_status_ext); +void ieee80211_tx_rate_update(struct ieee80211_hw *hw, + struct ieee80211_sta *pubsta, + struct ieee80211_tx_info *info) +{ + struct ieee80211_local *local = hw_to_local(hw); + struct ieee80211_supported_band *sband; + struct sta_info *sta; + struct ieee80211_tx_status status; + + sband = hw->wiphy->bands[info->band]; + + sta = container_of(pubsta, struct sta_info, sta); + status.skb = NULL; + status.info = info; + status.sta = pubsta; + + rate_control_tx_status(local, sband, &status); + if (ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL)) + sta->tx_stats.last_rate = info->status.rates[0]; +} +EXPORT_SYMBOL(ieee80211_tx_rate_update); + void ieee80211_report_low_ack(struct ieee80211_sta *pubsta, u32 num_packets) { struct sta_info *sta = container_of(pubsta, struct sta_info, sta); From patchwork Thu Oct 11 12:45:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anilkumar Kolli X-Patchwork-Id: 10636629 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D6AC716B1 for ; Thu, 11 Oct 2018 12:42:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE57C2B482 for ; Thu, 11 Oct 2018 12:42:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2A012B488; Thu, 11 Oct 2018 12:42:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 439622B482 for ; Thu, 11 Oct 2018 12:42:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=6P70hs8JqmuBngsTCMrggBdOGkMq9GaXaY4GhnUAA1U=; b=Eo4IdKDOeGtvXhSEJgvYoPtwH1 OGxdpgiMVN4pxVuS/Wk71L8pnxtaX9lvA6If8FBQbAXzyK9Wk8DHabZ9wujHEg/fUdfwUVFxWy0Nj JsJTLmHytql9x+0QCHR/OC+TDV27kYaoMV6E3/g9TJMF1fyR8Wkg/nA/GEGZWNwp3K5W7Mij5OKyx gnH484xSUSuXxrfTahmfRn+DjiHUsU8c1ZE6/4WZBDcBPTOBcmxCBQh45cc3fTDbvYBosL71wCMcO DYDI0YtM7poGfsrEfC/l1drVMy91AYTvZMABeRYEglRJ76r3nhx7PKHwkaxP2Xgn81YjDVnldFQtC rVjOefRg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gAaIP-0000mg-0H; Thu, 11 Oct 2018 12:42:29 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gAaIK-0000fI-9j for ath10k@lists.infradead.org; Thu, 11 Oct 2018 12:42:27 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 8F6DB60866; Thu, 11 Oct 2018 12:42:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1539261733; bh=1u+6MRMHf4V32a+YV878kCKCO6gX17nuS1lCNtG0gjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AutDxBz3t2shFAOb23/iQD2trIzIE6NK8qjI9+6JR5jmhPR6dBByhjuHeRki0cuoy KnSxcylH1zDZ8qtjjXh05AoU5vVrhn6A5DV88t3LNSAEgkD10xqkef2m0+XfnJ+4oR 87Qmo67NLnumMBDSQ5IAg/xfeapFGCa+8W6YkmCY= Received: from localhost (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: akolli@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 35C91602D7; Thu, 11 Oct 2018 12:42:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1539261733; bh=1u+6MRMHf4V32a+YV878kCKCO6gX17nuS1lCNtG0gjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AutDxBz3t2shFAOb23/iQD2trIzIE6NK8qjI9+6JR5jmhPR6dBByhjuHeRki0cuoy KnSxcylH1zDZ8qtjjXh05AoU5vVrhn6A5DV88t3LNSAEgkD10xqkef2m0+XfnJ+4oR 87Qmo67NLnumMBDSQ5IAg/xfeapFGCa+8W6YkmCY= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 35C91602D7 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=akolli@codeaurora.org From: Anilkumar Kolli To: ath10k@lists.infradead.org Subject: [PATCH 2/2] ath10k: report tx rate using ieee80211_tx_rate_update() Date: Thu, 11 Oct 2018 18:15:04 +0530 Message-Id: <1539261904-9016-3-git-send-email-akolli@codeaurora.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1539261904-9016-1-git-send-email-akolli@codeaurora.org> References: <1539261904-9016-1-git-send-email-akolli@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181011_054224_439964_FFEC83CD X-CRM114-Status: GOOD ( 14.73 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anilkumar Kolli , linux-wireless@vger.kernel.org MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Mesh path metric needs tx rate information from ieee80211_tx_status() call but in ath10k there is no mechanism to report tx rate information via ieee80211_tx_status(), the tx rate is only accessible via sta_statiscs() op. Per peer tx stats has tx rate info available, Tx rate is available to ath10k driver after every 4 PPDU sent in the air. For each PPDU, ath10k driver updates rate informattion to mac80211 using ieee80211_tx_rate_update(). Per peer txrate information is updated through per peer statistics and is available for QCA9888/QCA9984/QCA4019/QCA998X only Tested on QCA9984 with firmware-5.bin_10.4-3.5.3-00053 Tested on QCA998X with firmware-5.bin_10.2.4-1.0-00036 Signed-off-by: Anilkumar Kolli --- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/htt_rx.c | 70 +++++++++++++++++++++++++++--- drivers/net/wireless/ath/ath10k/wmi.h | 1 + 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 491eb0d2fc5f..cd4ed5cab630 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -494,6 +494,7 @@ struct ath10k_sta { u32 smps; u16 peer_id; struct rate_info txrate; + struct ieee80211_tx_info tx_info; struct work_struct update_wk; u64 rx_duration; diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index b862d5de5e2f..2c871ecd6afc 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -2627,7 +2627,7 @@ void ath10k_htt_htc_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) dev_kfree_skb_any(skb); } -static inline int ath10k_get_legacy_rate_idx(struct ath10k *ar, u8 rate) +static inline s8 ath10k_get_legacy_rate_idx(struct ath10k *ar, u8 rate) { static const u8 legacy_rates[] = {1, 2, 5, 11, 6, 9, 12, 18, 24, 36, 48, 54}; @@ -2646,7 +2646,7 @@ static inline int ath10k_get_legacy_rate_idx(struct ath10k *ar, u8 rate) ath10k_accumulate_per_peer_tx_stats(struct ath10k *ar, struct ath10k_sta *arsta, struct ath10k_per_peer_tx_stats *pstats, - u8 legacy_rate_idx) + s8 legacy_rate_idx) { struct rate_info *txrate = &arsta->txrate; struct ath10k_htt_tx_stats *tx_stats; @@ -2768,8 +2768,11 @@ static inline int ath10k_get_legacy_rate_idx(struct ath10k *ar, u8 rate) struct ath10k_per_peer_tx_stats *peer_stats) { struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv; - u8 rate = 0, rate_idx = 0, sgi; + struct ieee80211_chanctx_conf *conf = NULL; struct rate_info txrate; + u8 rate = 0, sgi; + s8 rate_idx = 0; + bool skip_auto_rate; lockdep_assert_held(&ar->data_lock); @@ -2778,6 +2781,13 @@ static inline int ath10k_get_legacy_rate_idx(struct ath10k *ar, u8 rate) txrate.nss = ATH10K_HW_NSS(peer_stats->ratecode); txrate.mcs = ATH10K_HW_MCS_RATE(peer_stats->ratecode); sgi = ATH10K_HW_GI(peer_stats->flags); + skip_auto_rate = ATH10K_FW_SKIPPED_RATE_CTRL(peer_stats->flags); + + /* Firmware's rate control skips broadcast/management frames, + * if host has configure fixed rates and in some other special cases. + */ + if (skip_auto_rate) + return; if (txrate.flags == WMI_RATE_PREAMBLE_VHT && txrate.mcs > 9) { ath10k_warn(ar, "Invalid VHT mcs %hhd peer stats", txrate.mcs); @@ -2792,7 +2802,7 @@ static inline int ath10k_get_legacy_rate_idx(struct ath10k *ar, u8 rate) } memset(&arsta->txrate, 0, sizeof(arsta->txrate)); - + memset(&arsta->tx_info.status, 0, sizeof(arsta->tx_info.status)); if (txrate.flags == WMI_RATE_PREAMBLE_CCK || txrate.flags == WMI_RATE_PREAMBLE_OFDM) { rate = ATH10K_HW_LEGACY_RATE(peer_stats->ratecode); @@ -2811,11 +2821,59 @@ static inline int ath10k_get_legacy_rate_idx(struct ath10k *ar, u8 rate) arsta->txrate.mcs = txrate.mcs; } - if (sgi) - arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI; + switch (txrate.flags) { + case WMI_RATE_PREAMBLE_OFDM: + if (arsta->arvif && arsta->arvif->vif) + conf = rcu_dereference(arsta->arvif->vif->chanctx_conf); + if (conf && conf->def.chan->band == NL80211_BAND_5GHZ) + arsta->tx_info.status.rates[0].idx = rate_idx - 4; + break; + case WMI_RATE_PREAMBLE_CCK: + arsta->tx_info.status.rates[0].idx = rate_idx; + if (sgi) + arsta->tx_info.status.rates[0].flags |= + (IEEE80211_TX_RC_USE_SHORT_PREAMBLE | + IEEE80211_TX_RC_SHORT_GI); + break; + case WMI_RATE_PREAMBLE_HT: + arsta->tx_info.status.rates[0].idx = + txrate.mcs + ((txrate.nss - 1) * 8); + if (sgi) + arsta->tx_info.status.rates[0].flags |= + IEEE80211_TX_RC_SHORT_GI; + arsta->tx_info.status.rates[0].flags |= IEEE80211_TX_RC_MCS; + break; + case WMI_RATE_PREAMBLE_VHT: + ieee80211_rate_set_vht(&arsta->tx_info.status.rates[0], + txrate.mcs, txrate.nss); + if (sgi) + arsta->tx_info.status.rates[0].flags |= + IEEE80211_TX_RC_SHORT_GI; + arsta->tx_info.status.rates[0].flags |= IEEE80211_TX_RC_VHT_MCS; + break; + } arsta->txrate.nss = txrate.nss; arsta->txrate.bw = ath10k_bw_to_mac80211_bw(txrate.bw); + if (sgi) + arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI; + + switch (arsta->txrate.bw) { + case RATE_INFO_BW_40: + arsta->tx_info.status.rates[0].flags |= + IEEE80211_TX_RC_40_MHZ_WIDTH; + break; + case RATE_INFO_BW_80: + arsta->tx_info.status.rates[0].flags |= + IEEE80211_TX_RC_80_MHZ_WIDTH; + break; + } + + if (peer_stats->succ_pkts) { + arsta->tx_info.flags = IEEE80211_TX_STAT_ACK; + arsta->tx_info.status.rates[0].count = 1; + ieee80211_tx_rate_update(ar->hw, sta, &arsta->tx_info); + } if (ath10k_debug_is_extd_tx_stats_enabled(ar)) ath10k_accumulate_per_peer_tx_stats(ar, arsta, peer_stats, diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index 300f20523204..ef41a0b827f2 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -4984,6 +4984,7 @@ enum wmi_rate_preamble { (((preamble) << 6) | ((nss) << 4) | (rate)) #define ATH10K_HW_AMPDU(flags) ((flags) & 0x1) #define ATH10K_HW_BA_FAIL(flags) (((flags) >> 1) & 0x3) +#define ATH10K_FW_SKIPPED_RATE_CTRL(flags) (((flags) >> 6) & 0x1) #define ATH10K_VHT_MCS_NUM 10 #define ATH10K_BW_NUM 4