[dpdk-stable] patch 'net/ena: remove unused macro' has been queued to LTS release 18.11.11

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/24/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/820571e6ccc0082bbf9b677903cdd57a46119888

Thanks.

Kevin.

---
>From 820571e6ccc0082bbf9b677903cdd57a46119888 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Fri, 23 Oct 2020 10:43:51 +0200
Subject: [PATCH] net/ena: remove unused macro

[ upstream commit 8bb7b198297d4d33b720b69480e2b41fb9ca91fb ]

This assert macro is not called anymore.
This also fixes an invalid reference to RTE_LOGTYPE_ERR that does not
exist.

Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version")
Fixes: 6f1c9df9e9cc ("net/ena: use dynamic log type for debug logging")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Michal Krawczyk <mk at semihalf.com>
---
 drivers/net/ena/base/ena_plat_dpdk.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
index 7be9a254a1..4bc2a2b553 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -69,16 +69,4 @@ typedef uint64_t dma_addr_t;
 	(rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz())
 
-#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
-#define ENA_ASSERT(cond, format, arg...)				\
-	do {								\
-		if (unlikely(!(cond))) {				\
-			RTE_LOG(ERR, PMD, format, ##arg);		\
-			rte_panic("line %d\tassert \"" #cond "\""	\
-					"failed\n", __LINE__);		\
-		}							\
-	} while (0)
-#else
-#define ENA_ASSERT(cond, format, arg...) do {} while (0)
-#endif
 
 #define ENA_MAX_T(type, x, y) RTE_MAX((type)(x), (type)(y))
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-18 16:33:39.064393633 +0000
+++ 0060-net-ena-remove-unused-macro.patch	2020-11-18 16:33:37.984215097 +0000
@@ -1 +1 @@
-From 8bb7b198297d4d33b720b69480e2b41fb9ca91fb Mon Sep 17 00:00:00 2001
+From 820571e6ccc0082bbf9b677903cdd57a46119888 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8bb7b198297d4d33b720b69480e2b41fb9ca91fb ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17,2 +18,2 @@
- drivers/net/ena/base/ena_plat_dpdk.h | 13 -------------
- 1 file changed, 13 deletions(-)
+ drivers/net/ena/base/ena_plat_dpdk.h | 12 ------------
+ 1 file changed, 12 deletions(-)
@@ -21 +22 @@
-index ae4fd8f868..a6782f3732 100644
+index 7be9a254a1..4bc2a2b553 100644
@@ -24 +25,2 @@
-@@ -74,17 +74,4 @@ typedef uint64_t dma_addr_t;
+@@ -69,16 +69,4 @@ typedef uint64_t dma_addr_t;
+ 	(rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz())
@@ -26 +27,0 @@
- extern int ena_logtype_com;
@@ -31,2 +32 @@
--			rte_log(RTE_LOGTYPE_ERR, ena_logtype_com,	\
--				format, ##arg);				\
+-			RTE_LOG(ERR, PMD, format, ##arg);		\