Received: by 2002:ac0:b08d:0:0:0:0:0 with SMTP id l13csp4917521imc; Mon, 25 Feb 2019 13:35:46 -0800 (PST) X-Google-Smtp-Source: AHgI3IZUUk4khWZTFGUSfY5v+T8FLcnJYgjfkgk0zNr/+C9wuisiOCZmHBbM2GbPgQddbCOBzejv X-Received: by 2002:a17:902:b902:: with SMTP id bf2mr22872960plb.286.1551130546855; Mon, 25 Feb 2019 13:35:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551130546; cv=none; d=google.com; s=arc-20160816; b=UEVprKxXkKD8YXzvcv1hFs6e4viQ6GOvBosqAollzW1Hmx7zOWj8DBt/UBEZceB3zc GOpypPJb94W3VjzWlhLqRkRFJSoZBNBRuqpAGat1qhej0vn0Lhu93HC7G+Vqgck2JnEO XMfqAKIpkOP5MyWbk5saP9/qEOhKwGwEQDx8z2Fc0hnCQJge3YWWpBzYOhTfPqCw5omy qF25Ag5HQ92wZLntmTcM9c6yR032Ns7DHxY/wou7p551Xn+jrZJbUxp1eblCbNGbBIyv 9Da7S+TKsXlA2Bbwx8LNqZ29Jfi6Dq8AcR7S9ajq5mG8OcijBTgbYFaOXSi+03+Dx2Tg 34Iw== 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=UgVBYsxnmH1TbJEm+E4JXfZiFIn6rfdSJNlVBKQkuGU=; b=OsoAakzcPHClf9ysJbNQc5K/SkQqUl4UrxtoUDDjzEK0K0Y3ufQzvJFsNgdlOYAMDH Z940SMu3tkHw4vrseub6RUYL7K7l046caowEOPRmegQvCVB2nabKkFh6mwygk5gpi46Y 8HMzDPFjoRo4pZtklac5xc96Gkr9s3S+xeiwChh102L5ZtZdXFtIzwP1L2vpWWxWk3uo 8kRN0HN9QzQeODBUf5wETV1nGwXj1Rhz44nRH+jyd003afET51uVSX+NQ2UI5TNkLUYG vPB6HpYbab3sYsbR78tM9P1AXbFPdiOw80WayjuRJW4nTC8ItF/zjDGqtOG5KBzncTsU IoHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=o9HVZGVn; 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 1si10920500pln.122.2019.02.25.13.35.31; Mon, 25 Feb 2019 13:35:46 -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=o9HVZGVn; 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 S1732748AbfBYVeC (ORCPT + 99 others); Mon, 25 Feb 2019 16:34:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:40190 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731870AbfBYVdz (ORCPT ); Mon, 25 Feb 2019 16:33:55 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 BC9F520578; Mon, 25 Feb 2019 21:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130435; bh=u2SXHdRQdC9Ehd0hNEvWgkFCmMqp9dq+fU8TFikzUSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o9HVZGVnaYOUCgggRsyGVtIvIo+NqpkAGxhoV5/hqYwAAvIQO+hHBapvduk/IoqHc 7VUvickoInBJb/ygRtCHidVlKMP0fTgNhTXKIrkHiX4OMV1lYIqR71NXbdGaCYf0sS EZrrOOyN4LfbKBaSrJqdBY27svhlkcEfBcpdw91U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tariq Toukan , Saeed Mahameed , Sasha Levin Subject: [PATCH 4.20 120/183] net/mlx5e: Fix wrong (zero) TX drop counter indication for representor Date: Mon, 25 Feb 2019 22:11:33 +0100 Message-Id: <20190225195114.848650329@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195054.748060397@linuxfoundation.org> References: <20190225195054.748060397@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 7fdc1adc52d3975740547a78c2df329bb207f15d ] For representors, the TX dropped counter is not folded from the per-ring counters. Fix it. Signed-off-by: Tariq Toukan Signed-off-by: Saeed Mahameed Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index 820fe85100b08..4dccc84fdcf2c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -143,6 +143,7 @@ static void mlx5e_rep_update_sw_counters(struct mlx5e_priv *priv) s->tx_packets += sq_stats->packets; s->tx_bytes += sq_stats->bytes; + s->tx_queue_dropped += sq_stats->dropped; } } } -- 2.19.1