From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77524C43603 for ; Tue, 10 Dec 2019 22:36:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4092F207FF for ; Tue, 10 Dec 2019 22:36:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576017392; bh=88nlQLQOG7FNuFDG/FIoRgkYkA2HT4aME8ROIrdGfDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VFCeBnTYIEo+5O1tftPjv0BGuwTjuAHFyUcD98rhboPgnyrG1z/RMeawnJaR+G4rD fwyCd3LugszVNqgX3Zm8rupCABgtUEIapPJ75boswWNb4n0O3ZGk/R0T5Zo7UUGvQ7 mx2ay96z6iwLJj7ZL1UuESRnf6GWrWBvsZwdEQDQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729057AbfLJWgb (ORCPT ); Tue, 10 Dec 2019 17:36:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:55636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730221AbfLJWeR (ORCPT ); Tue, 10 Dec 2019 17:34:17 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E8DAC214D8; Tue, 10 Dec 2019 22:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576017256; bh=88nlQLQOG7FNuFDG/FIoRgkYkA2HT4aME8ROIrdGfDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GSBgAaQmnO70LzrJHcqZ7/VPRb2cW9FinwweuRj/uKI4yybG9XcCIU/FP/+tXFT4Y fxZSQ5Y4Uz3LHW4XFOu/MagUdxALEWTgYaVpQCHeRFypeWVmxnqkEOQ19EXfUjf94e QX+XPDP/HO/nigasWRgewrs7/gXoMzSDdfRy8hbQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Miaoqing Pan , Hou Bao Hou , Anilkumar Kolli , Kalle Valo , Sasha Levin , ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 51/71] ath10k: fix get invalid tx rate for Mesh metric Date: Tue, 10 Dec 2019 17:32:56 -0500 Message-Id: <20191210223316.14988-51-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210223316.14988-1-sashal@kernel.org> References: <20191210223316.14988-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Miaoqing Pan [ Upstream commit 05a11003a56507023f18d3249a4d4d119c0a3e9c ] ath10k does not provide transmit rate info per MSDU in tx completion, mark that as -1 so mac80211 will ignore the rates. This fixes mac80211 update Mesh link metric with invalid transmit rate info. Tested HW: QCA9984 Tested FW: 10.4-3.9.0.2-00035 Signed-off-by: Hou Bao Hou Signed-off-by: Anilkumar Kolli Signed-off-by: Miaoqing Pan Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath10k/txrx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c index 6d1105ab4592b..f9d0f8372e3fd 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c @@ -96,6 +96,8 @@ void ath10k_txrx_tx_unref(struct ath10k_htt *htt, info = IEEE80211_SKB_CB(msdu); memset(&info->status, 0, sizeof(info->status)); + info->status.rates[0].idx = -1; + trace_ath10k_txrx_tx_unref(ar, tx_done->msdu_id); if (tx_done->discard) { -- 2.20.1