[dpdk-stable] patch 'net/bnxt: fix error handling in xstats' has been queued to LTS release 17.11.10

[luca.boccassi@gmail.com]

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 <kalesh-anakkur.purayil@broadcom.com>
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 <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
 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 <kalesh-anakkur.purayil@broadcom.com>
 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 <kalesh-anakkur.purayil@broadcom.com>
 Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
 Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
 ---
- 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);