Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp13432042ybl; Sun, 29 Dec 2019 11:43:37 -0800 (PST) X-Google-Smtp-Source: APXvYqzTmX6aYTzxq4q89NOxJ3sObuItqs//jdytfOJ8CuO+rIefyj29/ywqYPl+BXkIU2AJpApm X-Received: by 2002:a05:6830:18ed:: with SMTP id d13mr5310266otf.208.1577648617043; Sun, 29 Dec 2019 11:43:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577648617; cv=none; d=google.com; s=arc-20160816; b=g9d9AGFu/paiecSUAFDCe6pCMLFW0QoOej93P+Y7tyJ4lmozQb5QkGAkbsxNud8NVo qk33EgN3bAfrsF6naWA40uYhhIZSwvlg+iqqhCWDFCIvxzSSCo5KGUXc2Wi40d/Esh4x PqPriVcGablD28bfbBrszcnNNuOOF+iETX7QpnRKyP5SnmzWucWL92H+REopekdCnMEf cz/ExNox12DNhINqP+dXX2yI0RozxaeI0If6qRkY6MZan6LdEUU5uMoO84fmmEHtcw+R aLE670CCIObGbCVbPQ3qhE3ykXAHIQUchs0BGjYESPr9W6Up3jMzclptMvJtjA4qikGB QNWA== 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=bQiVGKobl85+aSkXiz0YsWVmmVl+NKzmVG6d0R+JRiE=; b=xcmiW4S9M47FtlL3NDFHS/E1kJrX9d5lVpq78TxtpRXFg3549LYYWSnc5RV45gxk1L 1wbfP2uTiLuNY9wUudzqma36mkmTfcFGH0+H1xkr/J57iQ4t92gqG7oYUbKdri+Gs3QK 2cy36ZfSpbWpqOuSFKLVs4Hn7QNlgHqSy88xBiWsgLvEEHmNmTEhWGSWOmWnsX1b3Hjr miNqqwTxuweDZ9DvgShTdxZLSYxNWYs5BddpJMImMlXNAEGGhHc/iuu1f9DRbgOf6ssh z56Fa87LXq55naobg9aob9SIMQcz8camBkKLXrL/iVN2lKc439n3JP3Mvxb7tHWqpEi3 UF+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HTice1Lm; 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 w5si22163896otq.238.2019.12.29.11.43.25; Sun, 29 Dec 2019 11:43:37 -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=HTice1Lm; 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 S1729442AbfL2RdY (ORCPT + 99 others); Sun, 29 Dec 2019 12:33:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:34684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729413AbfL2RdO (ORCPT ); Sun, 29 Dec 2019 12:33:14 -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 77650208E4; Sun, 29 Dec 2019 17:33:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640793; bh=z8k84aE2o/fiorG3eCJLu8pCuxUH0EtvkQNQAsTkzXA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HTice1Lmu+fYAknN0ii4uwTBHhoUKrbbk5ctVo+o2gua/MqJPTSkbO1neEsVTqNdl 8ZRhuEWLyme+kwgQ801MNT0LnZUpO0/XOI6mAyXodh6TaOP4ZeeiJ1MpBpznCj1gkg OAAlqnkgz6TSwTUglazPIDF+G6lnJsjdRlfYtISE= 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.19 142/219] ath10k: fix get invalid tx rate for Mesh metric Date: Sun, 29 Dec 2019 18:19:04 +0100 Message-Id: <20191229162529.988938865@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162508.458551679@linuxfoundation.org> References: <20191229162508.458551679@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 6f62ddc0494c..6c47e4b6aa6c 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c @@ -101,6 +101,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 (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) -- 2.20.1