Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp13387009ybl; Sun, 29 Dec 2019 10:39:22 -0800 (PST) X-Google-Smtp-Source: APXvYqwOxh4ErnEvRuRlQZfZN2ahqaeKAvTmbhxfdnkxxBezEnbOS7sFsc1IfXtlGwJx0knqTUZH X-Received: by 2002:a05:6830:1e46:: with SMTP id e6mr63544593otj.245.1577644762252; Sun, 29 Dec 2019 10:39:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577644762; cv=none; d=google.com; s=arc-20160816; b=bvpMGLMNz9gQmV4AfSEwwBPynWaOIdB72OshsG8rNBgZ5ReQKVVklgjcY6qP112dwx eif6Mn0z/WyqpNRbUnbR6mZ0FzxfQ86ppF2oEr5TYV0zlmLmzuZdkwi/Y91SCQlXS3iE KJqYcfp4g7HiVysbpuMaQReg5p6grBua8sNAcIZx/BJL2poGfZ451iYiBBQd9PxsCHWp UeqVI2imRoSG4faZfW87WAVCYjFvX5R3wiioTTrW7jY+iz+4zMi7NaCj2KYwwIJz4GnS k2tm9B7FOBX0V9DzmUYhYV35qZuSWxyAhq8lLo7mWPpVlwn8UGgzB3fXhDVZnrBdXIys xN8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=F0GsYeBtkJvd4D9nBEDgXY1moDVda8Gon7IVDjIv2jE=; b=m2J7WABy3fmoJ4T9z2CqqjQoopylvDtqESdfmWAVMuTLe+maa3TUfsvX0mDtSAt87e a4cCtvAdJMigsFtKQbS1Fa6sTioYaBJGwi79MEcajPHa6xbHAFLPPi94y89UOP8wRz0j oT+wu9NJjaVMjbuZTnabYwtQU39SQTyASnvh4SuCW0VdcBYtSx99qec/QM9G9Trd2Lt0 q3P6x/QummL5lYYHD2icfeHNYFXQMZnYh3CNKt9Jt0OOYnHt+2lHmcyQcC3uAm9Y4pMj XprAhejYGVbr/ZSnURR6LmBGkO721VcqxC4MNGKv/1Pul/IlUHAKZwtR6+bVip+XhmiL uVWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Dz9+wCg2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e63si20107814ote.166.2019.12.29.10.39.10; Sun, 29 Dec 2019 10:39:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Dz9+wCg2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727939AbfL2RZV (ORCPT + 99 others); Sun, 29 Dec 2019 12:25:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:44894 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727387AbfL2RZQ (ORCPT ); Sun, 29 Dec 2019 12:25:16 -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 1D841207FD; Sun, 29 Dec 2019 17:25:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640315; bh=3iVegaAnf9+YgnMhBD9cE2/VdDhRkPFAqOJY6Q+KbiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dz9+wCg2AI+ROrOafu80rMEnonK8oN5161myYztmPu597iDvKyrDoWzieOXbBRIg4 Yc1YVYUYyLLEKJpCywkU1krqDL1z+0BscndSjxLKlosk9eLsGl0gZPuY5NBcubcDUF rqLbiZJYSBajojV4f6s2pBWjhs4Zmf2+RRoz6QtU= 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.14 107/161] ath10k: fix get invalid tx rate for Mesh metric Date: Sun, 29 Dec 2019 18:19:15 +0100 Message-Id: <20191229162429.294496146@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162355.500086350@linuxfoundation.org> References: <20191229162355.500086350@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 d4986f626c35..9999c8c40269 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c @@ -100,6 +100,8 @@ int 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->status == HTT_TX_COMPL_STATE_DISCARD) { -- 2.20.1