From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 375A63B29E for ; Fri, 15 Feb 2019 11:49:20 -0500 (EST) Received: by mail-ed1-f65.google.com with SMTP id b3so8535478ede.1 for ; Fri, 15 Feb 2019 08:49:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1zSmmzsKU/67oSzxkP3nnUTXMLRwYqn+zk9jXOXk0W4=; b=Q/XxkojJ1Ch04DaqMIabfo8hl4FuIBYq9kqtLs5C9MEVavxML/cZpn4ltjFOOnDyc+ dvrs9yFhg25j01dMqBrzHUSfyd5ZQTYG4dCirDZ6KvdQPbVvUHQ7YqJOU+6tCw6nomy2 yoKHx9xv4eaNm8g3Zhau+8LP8GoXWsfR2YOAJcugveHlV8QexPBp8RsOnHXl1LQhnZ38 +TbqC1ZRCeW8zYB88tON5gyn94mDI7q39UDYZQmRiGZWSXF2d+lbj+pa+UIIjKh+NqRn 6yJiBzfrAlH1EUUB0jKK10X2pUopSBZkH/0O3s5WV/YKNo6iMqpD+lcXUwVduAXjGk9h rmdg== X-Gm-Message-State: AHQUAuYnhGiaToqzf9kr78K255qAXBuu2BMefvciAUs8Lu2fUgqNzQLg 1redca4mawvHxF1TPNwQhayRUPWPuskSfw== X-Google-Smtp-Source: AHgI3IYLDn+bYGu683n6n8Dn+3n3w/cRp7DiCxBrsKIHNIzzleryALCsXPYuKV7ouu7ur+eDB+zfiw== X-Received: by 2002:a17:906:28c9:: with SMTP id p9mr1786607ejd.43.1550249358831; Fri, 15 Feb 2019 08:49:18 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk (borgediget.toke.dk. [85.204.121.218]) by smtp.gmail.com with ESMTPSA id s14sm1315992ejz.35.2019.02.15.08.49.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Feb 2019 08:49:17 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 7A55A1825DD; Fri, 15 Feb 2019 17:49:17 +0100 (CET) From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= To: make-wifi-fast@lists.bufferbloat.net, linux-wireless@vger.kernel.org Date: Fri, 15 Feb 2019 17:48:55 +0100 Message-Id: <20190215164855.30666-1-toke@redhat.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Make-wifi-fast] [PATCH] ath9k: Make sure to zero status.tx_time before reporting TX status X-BeenThere: make-wifi-fast@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Feb 2019 16:49:20 -0000 Since ath9k reports airtime usage directly using the ieee80211_report_airtime() callback, it shouldn't also report it using the tx_time in status. Make sure the field is zeroed before TX status is reported to avoid spurious airtime being accounted by bits being left over from earlier uses of the cb. Fixes: 89cea7493a34 ("ath9k: Switch to mac80211 TXQ scheduling and airtime APIs") Signed-off-by: Toke Høiland-Jørgensen --- drivers/net/wireless/ath/ath9k/xmit.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 06e0c5a6fab6..773d428ff1b0 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -2552,6 +2552,9 @@ static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf, } tx_info->status.rates[tx_rateindex].count = ts->ts_longretry + 1; + + /* we report airtime in ath_tx_count_airtime(), don't report twice */ + tx_info->status.tx_time = 0; } static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) -- 2.20.1