[dpdk-stable] patch 'net/octeontx2: remove useless check before free' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 27fb25749f55e70beb2963a7a4f85982f5425a18 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Fri, 9 Oct 2020 20:39:05 +0800
Subject: [PATCH] net/octeontx2: remove useless check before free

[ upstream commit 29892e064c1813927195fdbb7d80aede1ccd017d ]

The glibc free allows free(NULL) as null operation,
so remove this useless null checks.

Coverity issue: 357719
Fixes: da138cd47e06 ("net/octeontx2: handle port reconfigure")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/net/octeontx2/otx2_ethdev.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c
index 41930c5df0..c952373be4 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -1170,10 +1170,8 @@ nix_store_queue_cfg_and_then_release(struct rte_eth_dev *eth_dev)
 	return 0;
 
 fail:
-	if (tx_qconf)
-		free(tx_qconf);
-	if (rx_qconf)
-		free(rx_qconf);
+	free(tx_qconf);
+	free(rx_qconf);
 
 	return -ENOMEM;
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:17.121309085 +0000
+++ 0174-net-octeontx2-remove-useless-check-before-free.patch	2020-10-28 10:35:11.780834087 +0000
@@ -1,14 +1,15 @@
-From 29892e064c1813927195fdbb7d80aede1ccd017d Mon Sep 17 00:00:00 2001
+From 27fb25749f55e70beb2963a7a4f85982f5425a18 Mon Sep 17 00:00:00 2001
 From: Yunjian Wang <wangyunjian at huawei.com>
 Date: Fri, 9 Oct 2020 20:39:05 +0800
 Subject: [PATCH] net/octeontx2: remove useless check before free
 
+[ upstream commit 29892e064c1813927195fdbb7d80aede1ccd017d ]
+
 The glibc free allows free(NULL) as null operation,
 so remove this useless null checks.
 
 Coverity issue: 357719
 Fixes: da138cd47e06 ("net/octeontx2: handle port reconfigure")
-Cc: stable at dpdk.org
 
 Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
 Acked-by: Jerin Jacob <jerinj at marvell.com>
@@ -17,10 +18,10 @@
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c
-index 03d81faef1..b69b92bf58 100644
+index 41930c5df0..c952373be4 100644
 --- a/drivers/net/octeontx2/otx2_ethdev.c
 +++ b/drivers/net/octeontx2/otx2_ethdev.c
-@@ -1383,10 +1383,8 @@ nix_store_queue_cfg_and_then_release(struct rte_eth_dev *eth_dev)
+@@ -1170,10 +1170,8 @@ nix_store_queue_cfg_and_then_release(struct rte_eth_dev *eth_dev)
  	return 0;
  
  fail: