From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id D4872A00E6 for ; Tue, 16 Apr 2019 16:38:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BA8941B4F5; Tue, 16 Apr 2019 16:38:11 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 08A8D1B4EA for ; Tue, 16 Apr 2019 16:38:11 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A493307EA8C; Tue, 16 Apr 2019 14:38:10 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-214.ams2.redhat.com [10.36.117.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93B3D1001E92; Tue, 16 Apr 2019 14:38:09 +0000 (UTC) From: Kevin Traynor To: Igor Russkikh Cc: dpdk stable Date: Tue, 16 Apr 2019 15:36:44 +0100 Message-Id: <20190416143719.21601-26-ktraynor@redhat.com> In-Reply-To: <20190416143719.21601-1-ktraynor@redhat.com> References: <20190416143719.21601-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 16 Apr 2019 14:38:10 +0000 (UTC) Subject: [dpdk-stable] patch 'net/atlantic: fix xstats return' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/24/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. Thanks. Kevin Traynor --- >From 357f86784d3c9a9715f5a6591edddcd431668c80 Mon Sep 17 00:00:00 2001 From: Igor Russkikh Date: Tue, 12 Mar 2019 15:25:10 +0000 Subject: [PATCH] net/atlantic: fix xstats return [ upstream commit 5ab51dbfd4e7f14d0b0329cec33d5d545bd610bc ] Max number of xstats items was returned instead of actual number of filled in records. Fixes: fbe059e87209 ("net/atlantic: implement device statistics") Signed-off-by: Igor Russkikh --- drivers/net/atlantic/atl_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c index 0fc7af83e..acc00966f 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -759,5 +759,5 @@ atl_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused, atl_xstats_tbl[i].name); - return size; + return i; } @@ -779,5 +779,5 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, } - return n; + return i; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-16 15:34:26.362918538 +0100 +++ 0026-net-atlantic-fix-xstats-return.patch 2019-04-16 15:34:25.171180149 +0100 @@ -1,13 +1,14 @@ -From 5ab51dbfd4e7f14d0b0329cec33d5d545bd610bc Mon Sep 17 00:00:00 2001 +From 357f86784d3c9a9715f5a6591edddcd431668c80 Mon Sep 17 00:00:00 2001 From: Igor Russkikh Date: Tue, 12 Mar 2019 15:25:10 +0000 Subject: [PATCH] net/atlantic: fix xstats return +[ upstream commit 5ab51dbfd4e7f14d0b0329cec33d5d545bd610bc ] + Max number of xstats items was returned instead of actual number of filled in records. Fixes: fbe059e87209 ("net/atlantic: implement device statistics") -Cc: stable@dpdk.org Signed-off-by: Igor Russkikh --- @@ -15,7 +16,7 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c -index b05dc545d..5c62d137b 100644 +index 0fc7af83e..acc00966f 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -759,5 +759,5 @@ atl_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused,