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 BB2C8A04F3 for ; Thu, 19 Dec 2019 15:37:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AD5C51BF92; Thu, 19 Dec 2019 15:37:39 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 6F6111BF92 for ; Thu, 19 Dec 2019 15:37:37 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id d16so6188461wre.10 for ; Thu, 19 Dec 2019 06:37:37 -0800 (PST) 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=O0TvUze+hxsZNVS2Oe47qoj80Nu9QdEYx1430tTGqUA=; b=KexeevTL/vnOuGuyG4KOFoGMS72cek2l8Zu9KRJvoiU2So1wlSDWQIQPLflNXIis49 FxGg2ZGndQt/p5wQbes56eQCdeu/RB0mlmYfgDsg0SRA1f6Viajk5G+5o68u08/9WX+a FhNF86ApledQfzT1FxyBc6eySUkHVigatAya0a9HGDJuCsv481sqCwNqsA8j0oJJ2SgV bt4BGZdIkVXKEMoQAjKFp9JL9rXqGJO8jLm0oGNBPZzTRLpwQRxiTrToofMWTaNW4PTj 0kPJ4Q5tT8r83zO3lAWMiWS/6k30OvsS0it+7kEWubCfuxnYrLiZM6bgPnzcI8WI0IPD bcHg== 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=O0TvUze+hxsZNVS2Oe47qoj80Nu9QdEYx1430tTGqUA=; b=sZtQPG/JtWlmaIRhvVIAcOYNWsOQgi0Gu1hEQ7o6D3PCE0OjLzxZ/CoP6sqDWHEZWc 5Qo26GauaOTcfT39LGwliMrojLk0pHFZbkqdUWbPDvyAFipcI79DDc2qFT19ZYWYi1qw uc30KBWlNx1N0IEZarov1q8ByBNnPOay+bXSH8OhFSaxyozi2RH6Ng0ETDXSPtL11yIn l9hhkANPCm0VPjgXWsut+tcUutzxfV0w7LSO0K+bMcfXTlLWGCIYHU5cBbjxjbcxmDry n6Aj5qMJ9yZCy9QsVUawtns7ARXIwAoKzJe3C5Qth8u4Bv9K4eoqwG/IMlcObTX0Wc/9 S/lw== X-Gm-Message-State: APjAAAX+EGHyUCuMHVqzU0IgqlAYuJ6KhG/PCeTqiu8OEh1q/M+Bpk73 5zwk5GlmJLdRsCv9E5iMHTFLIZW3hgM= X-Google-Smtp-Source: APXvYqwbMv0i/oN484NvKjt4l59IEqTCs/pV8gRzbMO+30TVdBfTCGQITU+S3IcrVbw+VzNOSGdRtA== X-Received: by 2002:a5d:43c7:: with SMTP id v7mr9243742wrr.32.1576766257160; Thu, 19 Dec 2019 06:37:37 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u13sm6336615wmd.36.2019.12.19.06.37.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:37:36 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Thu, 19 Dec 2019 14:33:36 +0000 Message-Id: <20191219143447.21506-69-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix error handling in xstats' has been queued to LTS release 17.11.10 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 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/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. Luca Boccassi --- >From cf96c144f07d6ac3800a8abccef4f7d3d7e367f6 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Fri, 11 Oct 2019 10:46:44 +0530 Subject: [PATCH] net/bnxt: fix error handling in xstats [ upstream commit 9bc556e3ecec6c1127c6d6c99660742315c59282 ] Add missing return instead of setting the error status in case of error. Fixes: bfb9c2260be2 ("net/bnxt: support xstats get/reset") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_stats.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c index 6497926162..e85db7f6d0 100644 --- a/drivers/net/bnxt/bnxt_stats.c +++ b/drivers/net/bnxt/bnxt_stats.c @@ -365,6 +365,7 @@ void bnxt_dev_xstats_reset_op(struct rte_eth_dev *eth_dev) if (BNXT_VF(bp) || !BNXT_NPAR_PF(bp) || !(bp->flags & BNXT_FLAG_PORT_STATS)) { RTE_LOG(ERR, PMD, "Operation not supported\n"); + return; } ret = bnxt_hwrm_port_clr_stats(bp); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:29.067360477 +0000 +++ 0069-net-bnxt-fix-error-handling-in-xstats.patch 2019-12-19 14:32:26.153298777 +0000 @@ -1,30 +1,30 @@ -From 9bc556e3ecec6c1127c6d6c99660742315c59282 Mon Sep 17 00:00:00 2001 +From cf96c144f07d6ac3800a8abccef4f7d3d7e367f6 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Fri, 11 Oct 2019 10:46:44 +0530 Subject: [PATCH] net/bnxt: fix error handling in xstats +[ upstream commit 9bc556e3ecec6c1127c6d6c99660742315c59282 ] + Add missing return instead of setting the error status in case of error. Fixes: bfb9c2260be2 ("net/bnxt: support xstats get/reset") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- - drivers/net/bnxt/bnxt_stats.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + drivers/net/bnxt/bnxt_stats.c | 1 + + 1 file changed, 1 insertion(+) diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c -index f486a5634b..fa29f9de19 100644 +index 6497926162..e85db7f6d0 100644 --- a/drivers/net/bnxt/bnxt_stats.c +++ b/drivers/net/bnxt/bnxt_stats.c -@@ -575,7 +575,7 @@ int bnxt_dev_xstats_reset_op(struct rte_eth_dev *eth_dev) - if (BNXT_VF(bp) || !BNXT_SINGLE_PF(bp) || +@@ -365,6 +365,7 @@ void bnxt_dev_xstats_reset_op(struct rte_eth_dev *eth_dev) + if (BNXT_VF(bp) || !BNXT_NPAR_PF(bp) || !(bp->flags & BNXT_FLAG_PORT_STATS)) { - PMD_DRV_LOG(ERR, "Operation not supported\n"); -- ret = -ENOTSUP; -+ return -ENOTSUP; + RTE_LOG(ERR, PMD, "Operation not supported\n"); ++ return; } ret = bnxt_hwrm_port_clr_stats(bp);