From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3600EA0093 for ; Thu, 28 May 2020 18:26:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 299541DC13; Thu, 28 May 2020 18:26:27 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 328D01DC10 for ; Thu, 28 May 2020 18:26:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kH0yT8e9pGFqTgDXIOX24cm4Wf3BrBJVcaz4jeIWMpg=; b=iJoB71cYi5bFmzd2FtZIrQwW+g0gZI9cnky9pP8JTYX88tBpFscOqqyRyLP2VwUbsfFJIh 9y+pRmrLl0ff+jimxeFSJ68heIuBmmWxHEthOjKmXppB0joc4rM9TDfCaOTgw71V+RUl9w eWDhBUS77ffs9FNgCw3FBXES3NvtJhE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-190-yQb9i2P6ODaJQ-CIwu7_wQ-1; Thu, 28 May 2020 12:26:14 -0400 X-MC-Unique: yQb9i2P6ODaJQ-CIwu7_wQ-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 469268005AA; Thu, 28 May 2020 16:26:13 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62C1F60FC2; Thu, 28 May 2020 16:26:11 +0000 (UTC) From: Kevin Traynor To: Cheng Peng Cc: Xiaolong Ye , dpdk stable Date: Thu, 28 May 2020 17:23:13 +0100 Message-Id: <20200528162322.7863-86-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix stats query error code' has been queued to LTS release 18.11.9 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.9 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/03/20. 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/7f774a6ad8829e5a0addd7d59ec53c36c7be0eff Thanks. Kevin. --- >From 7f774a6ad8829e5a0addd7d59ec53c36c7be0eff Mon Sep 17 00:00:00 2001 From: Cheng Peng Date: Tue, 14 Apr 2020 09:56:57 +0800 Subject: [PATCH] net/iavf: fix stats query error code [ upstream commit fdfbfe7085934f3b84c5c8d89f4ab7d7016cb458 ] The iavf_dev_stats_get function should return ret instead of -eio. Fixes: f4a41a6953af ("net/avf: support stats") Signed-off-by: Cheng Peng Acked-by: Xiaolong Ye --- drivers/net/avf/avf_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c index e67621e4a9..8000e9c70d 100644 --- a/drivers/net/avf/avf_ethdev.c +++ b/drivers/net/avf/avf_ethdev.c @@ -999,5 +999,5 @@ avf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) PMD_DRV_LOG(ERR, "Get statistics failed"); } - return -EIO; + return ret; } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:03.563586053 +0100 +++ 0086-net-iavf-fix-stats-query-error-code.patch 2020-05-28 17:12:59.177554681 +0100 @@ -1 +1 @@ -From fdfbfe7085934f3b84c5c8d89f4ab7d7016cb458 Mon Sep 17 00:00:00 2001 +From 7f774a6ad8829e5a0addd7d59ec53c36c7be0eff Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fdfbfe7085934f3b84c5c8d89f4ab7d7016cb458 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - drivers/net/iavf/iavf_ethdev.c | 2 +- + drivers/net/avf/avf_ethdev.c | 2 +- @@ -17,5 +18,5 @@ -diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c -index 4280a92bb1..117fbc5f73 100644 ---- a/drivers/net/iavf/iavf_ethdev.c -+++ b/drivers/net/iavf/iavf_ethdev.c -@@ -1084,5 +1084,5 @@ iavf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c +index e67621e4a9..8000e9c70d 100644 +--- a/drivers/net/avf/avf_ethdev.c ++++ b/drivers/net/avf/avf_ethdev.c +@@ -999,5 +999,5 @@ avf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)