From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id 433B5A0471
for <public@inbox.dpdk.org>; Fri, 21 Jun 2019 18:53:06 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 344CD1D59E;
Fri, 21 Jun 2019 18:53:06 +0200 (CEST)
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
by dpdk.org (Postfix) with ESMTP id AA0511D59E
for <stable@dpdk.org>; Fri, 21 Jun 2019 18:53:04 +0200 (CEST)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 2CB312F8BDB;
Fri, 21 Jun 2019 16:53:04 +0000 (UTC)
Received: from rh.redhat.com (ovpn-117-77.ams2.redhat.com [10.36.117.77])
by smtp.corp.redhat.com (Postfix) with ESMTP id D682C60BE0;
Fri, 21 Jun 2019 16:53:01 +0000 (UTC)
From: Kevin Traynor <ktraynor@redhat.com>
To: David Marchand <david.marchand@redhat.com>
Cc: Keith Wiles <keith.wiles@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Fri, 21 Jun 2019 17:46:24 +0100
Message-Id: <20190621164626.31219-40-ktraynor@redhat.com>
In-Reply-To: <20190621164626.31219-1-ktraynor@redhat.com>
References: <20190621164626.31219-1-ktraynor@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.38]); Fri, 21 Jun 2019 16:53:04 +0000 (UTC)
Subject: [dpdk-stable] patch 'net/tap: fix RxQ errors stat' has been queued
to LTS release 18.11.3
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to LTS release 18.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/26/19. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/639afbff95223fd194cf0865432dbb1e248c83fe
Thanks.
Kevin Traynor
---
>From 639afbff95223fd194cf0865432dbb1e248c83fe Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Mon, 4 Mar 2019 12:18:35 +0100
Subject: [PATCH] net/tap: fix RxQ errors stat
[ upstream commit 6d84612124417acbe0bbb0b9952cf3270b3b3a0f ]
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: 02f96a0a82d1 ("net/tap: add TUN/TAP device PMD")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Keith Wiles <keith.wiles@intel.com>
---
drivers/net/tap/rte_eth_tap.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 867873683..e6d1ed6b4 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -971,8 +971,7 @@ tap_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *tap_stats)
for (i = 0; i < imax; i++) {
tap_stats->q_opackets[i] = pmd->txq[i].stats.opackets;
- tap_stats->q_errors[i] = pmd->txq[i].stats.errs;
tap_stats->q_obytes[i] = pmd->txq[i].stats.obytes;
tx_total += tap_stats->q_opackets[i];
- tx_err_total += tap_stats->q_errors[i];
+ tx_err_total += pmd->txq[i].stats.errs;
tx_bytes_total += tap_stats->q_obytes[i];
}
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-06-21 17:22:13.819817247 +0100
+++ 0040-net-tap-fix-RxQ-errors-stat.patch 2019-06-21 17:22:11.752518466 +0100
@@ -1 +1 @@
-From 6d84612124417acbe0bbb0b9952cf3270b3b3a0f Mon Sep 17 00:00:00 2001
+From 639afbff95223fd194cf0865432dbb1e248c83fe Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6d84612124417acbe0bbb0b9952cf3270b3b3a0f ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 9dd77311b..3841842f0 100644
+index 867873683..e6d1ed6b4 100644