From patchwork Thu Jan 2 22:07:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 234696 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 B3034C3276D for ; Thu, 2 Jan 2020 22:35:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 860E924125 for ; Thu, 2 Jan 2020 22:35:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004542; bh=fJ1V+VPyiiP3wYtPYmOrA2PYPLrQfGblkjGMH92NRT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Kf1Fh5wAZrWEQQiSD69RiEapKrXSZGWzNLwKc2sj0wSMG6sl54cQ7dW2n2odBDE/H SGneAScupqdYhxb9+uRl1LJvYjMstTtxUoa3mXtwAb7+0oM7DzJHD6T5v3IBVtf/ca Hdux8fDBCghLl/urOYWUHKdzqeMiNLg32fCkfpVQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730363AbgABWfl (ORCPT ); Thu, 2 Jan 2020 17:35:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:45646 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730855AbgABWfl (ORCPT ); Thu, 2 Jan 2020 17:35:41 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 07B3C22314; Thu, 2 Jan 2020 22:35:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004540; bh=fJ1V+VPyiiP3wYtPYmOrA2PYPLrQfGblkjGMH92NRT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gcKeugpw1sdc4jRywCFRcw8CsvrigATe4phALFhyfpg1S5hAQJ3OffLhN9BY42KfH fOphDS46mLSGpwJo7+z/dtveBIoUYRxP5gE6TZYYjuG5zkxFADNw/7j0SOBQlTimz2 7zYW4sA5siSY5yuBAeTWNGglpa5337UYIIJtEPk8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hou Bao Hou , Anilkumar Kolli , Miaoqing Pan , Kalle Valo , Sasha Levin Subject: [PATCH 4.4 049/137] ath10k: fix get invalid tx rate for Mesh metric Date: Thu, 2 Jan 2020 23:07:02 +0100 Message-Id: <20200102220553.192012345@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.618583146@linuxfoundation.org> References: <20200102220546.618583146@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 6d1105ab4592..f9d0f8372e3f 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) {