[dpdk-stable] patch 'net/ena/base: fix indentation of multiple defines' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

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 59acd7de4ca7894d6f9ab6fbdd541e66c8649111 Mon Sep 17 00:00:00 2001
From: Michal Krawczyk <mk at semihalf.com>
Date: Wed, 8 Apr 2020 10:29:06 +0200
Subject: [PATCH] net/ena/base: fix indentation of multiple defines

[ upstream commit 5dcdfbfaaf5c4223cdcbb2d08995236bfdb7e3c8 ]

As the alignment of the defines wasn't valid, it was removed at all, so
instead of using multiple spaces or tabs, the single space after define
name is being used.

Fixes: 99ecfbf845b3 ("ena: import communication layer")

Signed-off-by: Michal Krawczyk <mk at semihalf.com>
Reviewed-by: Igor Chauskin <igorch at amazon.com>
Reviewed-by: Guy Tzalik <gtzalik at amazon.com>
---
 drivers/net/ena/base/ena_com.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ena/base/ena_com.h b/drivers/net/ena/base/ena_com.h
index 2162eb42b8..f1593345e8 100644
--- a/drivers/net/ena/base/ena_com.h
+++ b/drivers/net/ena/base/ena_com.h
@@ -9,9 +9,9 @@
 #include "ena_plat.h"
 #include "ena_includes.h"
 
-#define ENA_MAX_NUM_IO_QUEUES		128U
+#define ENA_MAX_NUM_IO_QUEUES 128U
 /* We need to queues for each IO (on for Tx and one for Rx) */
-#define ENA_TOTAL_NUM_QUEUES		(2 * (ENA_MAX_NUM_IO_QUEUES))
+#define ENA_TOTAL_NUM_QUEUES (2 * (ENA_MAX_NUM_IO_QUEUES))
 
 #define ENA_MAX_HANDLERS 256
 
@@ -55,9 +55,9 @@
 #define ENA_INTR_MODER_LEVEL_STRIDE			1
 #define ENA_INTR_BYTE_COUNT_NOT_SUPPORTED		0xFFFFFF
 
-#define ENA_HW_HINTS_NO_TIMEOUT				0xFFFF
+#define ENA_HW_HINTS_NO_TIMEOUT 0xFFFF
 
-#define ENA_FEATURE_MAX_QUEUE_EXT_VER	1
+#define ENA_FEATURE_MAX_QUEUE_EXT_VER 1
 
 enum ena_intr_moder_level {
 	ENA_INTR_MODER_LOWEST = 0,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:46.944639997 +0100
+++ 0060-net-ena-base-fix-indentation-of-multiple-defines.patch	2020-05-19 14:04:44.208648228 +0100
@@ -1,8 +1,10 @@
-From 5dcdfbfaaf5c4223cdcbb2d08995236bfdb7e3c8 Mon Sep 17 00:00:00 2001
+From 59acd7de4ca7894d6f9ab6fbdd541e66c8649111 Mon Sep 17 00:00:00 2001
 From: Michal Krawczyk <mk at semihalf.com>
 Date: Wed, 8 Apr 2020 10:29:06 +0200
 Subject: [PATCH] net/ena/base: fix indentation of multiple defines
 
+[ upstream commit 5dcdfbfaaf5c4223cdcbb2d08995236bfdb7e3c8 ]
+
 As the alignment of the defines wasn't valid, it was removed at all, so
 instead of using multiple spaces or tabs, the single space after define
 name is being used.
@@ -17,12 +19,12 @@
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/ena/base/ena_com.h b/drivers/net/ena/base/ena_com.h
-index 6c9943df79..61074eaf63 100644
+index 2162eb42b8..f1593345e8 100644
 --- a/drivers/net/ena/base/ena_com.h
 +++ b/drivers/net/ena/base/ena_com.h
-@@ -8,9 +8,9 @@
- 
+@@ -9,9 +9,9 @@
  #include "ena_plat.h"
+ #include "ena_includes.h"
  
 -#define ENA_MAX_NUM_IO_QUEUES		128U
 +#define ENA_MAX_NUM_IO_QUEUES 128U
@@ -32,9 +34,9 @@
  
  #define ENA_MAX_HANDLERS 256
  
-@@ -33,9 +33,9 @@
- 
- #define ENA_HASH_KEY_SIZE				40
+@@ -55,9 +55,9 @@
+ #define ENA_INTR_MODER_LEVEL_STRIDE			1
+ #define ENA_INTR_BYTE_COUNT_NOT_SUPPORTED		0xFFFFFF
  
 -#define ENA_HW_HINTS_NO_TIMEOUT				0xFFFF
 +#define ENA_HW_HINTS_NO_TIMEOUT 0xFFFF
@@ -42,8 +44,8 @@
 -#define ENA_FEATURE_MAX_QUEUE_EXT_VER	1
 +#define ENA_FEATURE_MAX_QUEUE_EXT_VER 1
  
- struct ena_llq_configurations {
- 	enum ena_admin_llq_header_location llq_header_location;
+ enum ena_intr_moder_level {
+ 	ENA_INTR_MODER_LOWEST = 0,
 -- 
 2.20.1