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 6CABCA0093 for ; Tue, 19 May 2020 15:11:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 642C31D702; Tue, 19 May 2020 15:11:49 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 14FFC1D702 for ; Tue, 19 May 2020 15:11:48 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id l18so15858749wrn.6 for ; Tue, 19 May 2020 06:11:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PoJEEulS9MQPd7weW0P3hruJx3+9pBL4iHE5kV5ykBc=; b=gp14H07yb28NRvSP5ByhbrHQpVkZZGPLQ6uIaNdfJ2MxVpHydY/OiYtw/64NP0lOGt FTT1lH2Zv4NBeVBWcOfGt7hduxxk2NzZeM+VkyYd4NHcQpnwcSRdWeLnfwnr1r8zPkJO 7yzTcBRQcI0/omKn6BZvBC6gztVbpYS0jmWYHfOPV2SnJlljt7WkT8h8OQzQZl/T4NQb T+Zm47ig4Q4M26zoNRfkrXlsg6Gw2xQS5RC9Xpr2kiAK0NpQTmWA0w3VWWWGDtQqjTDO tqsHQuLN4FpMg+MTCKikFstIri29KaaE2eiO3s/bzYzdgAxd0yH0I56ID6KieBqY11Bv MXYA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=PoJEEulS9MQPd7weW0P3hruJx3+9pBL4iHE5kV5ykBc=; b=bM6in/KJIBixjVhqKbmPmJbwgRrpBnq5yHKhA/8hVZQQofIMSLa6Kck/HbUm5xN5l9 OsEQ+2OJvcUp7DT9KTPnksQNenzoAypQKZ/FLpv1xPcD240n8CysdwBnkVkpsKvqXHkK zB3bOtf7STKc0U7YSEhc7kVBntvfdoJrlRyUPvAtyxgzbNg8vEAPTsY2BgUiVu9Z+ZC9 cyZJL7hWoFZukVV9A0CEO0fwXFvbMQhZvS6aWfxN7itpdlgmOpbcxsDrEb4kdBsYwqcs q12XH5ZXQguEAuBtYpN6D/OcWgJpVZb/bKeilA+zK5EKbhyMAoQfyt/rsPrifhRTNHTA Sz4w== X-Gm-Message-State: AOAM532nGDQR6L7QIidldjllrm4mk9jmj7OT1MEVUyQL2HWna0R7O9go jxmfM6bGfu9pRWGzd5Uc3m8= X-Google-Smtp-Source: ABdhPJw2+CU4Ix3wQRqzhZyB4388gl7RgZ7jSRu8SUa2b4gayY6SeX0xdMmf6Xf7A+mV7RDsXJ9r1A== X-Received: by 2002:a5d:5106:: with SMTP id s6mr25085669wrt.267.1589893907826; Tue, 19 May 2020 06:11:47 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p8sm20780948wre.11.2020.05.19.06.11.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:11:47 -0700 (PDT) From: luca.boccassi@gmail.com To: Cheng Peng Cc: Xiaolong Ye , dpdk stable Date: Tue, 19 May 2020 14:04:06 +0100 Message-Id: <20200519130549.112823-111-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix stats query error code' has been queued to stable release 19.11.3 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 stable release 19.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 05/21/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. Thanks. Luca Boccassi --- >From c1b7cb6792de8f9f301940b24c4a1d07694db1bc 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/iavf/iavf_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index f544303c05..266200dbe6 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1079,7 +1079,7 @@ iavf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) } else { PMD_DRV_LOG(ERR, "Get statistics failed"); } - return -EIO; + return ret; } static int -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:49.009675974 +0100 +++ 0111-net-iavf-fix-stats-query-error-code.patch 2020-05-19 14:04:44.368651128 +0100 @@ -1,12 +1,13 @@ -From fdfbfe7085934f3b84c5c8d89f4ab7d7016cb458 Mon Sep 17 00:00:00 2001 +From c1b7cb6792de8f9f301940b24c4a1d07694db1bc 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") -Cc: stable@dpdk.org Signed-off-by: Cheng Peng Acked-by: Xiaolong Ye @@ -15,10 +16,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c -index 4280a92bb1..117fbc5f73 100644 +index f544303c05..266200dbe6 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c -@@ -1083,7 +1083,7 @@ iavf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +@@ -1079,7 +1079,7 @@ iavf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) } else { PMD_DRV_LOG(ERR, "Get statistics failed"); }