dpdk/ena: backport fixes added in 19.11, 20.02 and 20.05

For v16.04, v16.11, v17.02, v17.05, v17.08, v17.11, v18.02 and v18.05
the following fixes were added:
  * net/ena: limit refill threshold by fixed value
  * net/ena: set IO ring size to valid value
  * net/ena/base: prevent allocation of zero sized memory
  * net/ena/base: make allocation macros thread-safe
  * net/ena: ensure Rx buffer size is at least 1400B
  * net/ena: fix indication of bad L4 Rx checksums
  * net/ena/base: fix node deallocation

For v18.08 and v18.11 the following fixes were added:
  * net/ena: fix build for O1 optimization
  * net/ena: limit refill threshold by fixed value
  * net/ena: set IO ring size to valid value
  * net/ena/base: prevent allocation of zero sized memory
  * net/ena/base: make allocation macros thread-safe
  * net/ena: ensure Rx buffer size is at least 1400B
  * net/ena: fix indication of bad L4 Rx checksums
  * net/ena: fix admin CQ polling for 32-bit

For v19.02 and v19.05 the same as above, plus following fix was added:
  * net/ena: remove memory barriers before doorbells

For v19.08 the following fixes were added:
  * net/ena: fix build for O1 optimization
  * net/ena: limit refill threshold by fixed value
  * net/ena: remove memory barriers before doorbells
  * net/ena: set IO ring size to valid value
  * net/ena/base: prevent allocation of zero sized memory
  * net/ena/base: make allocation macros thread-safe
  * net/ena: ensure Rx buffer size is at least 1400B
  * net/ena: fix indication of bad L4 Rx checksums

For v19.11 and v20.02 the following fixes were added:
  * net/ena: fix build for O1 optimization
  * net/ena: limit refill threshold by fixed value
  * net/ena: remove memory barriers before doorbells
  * net/ena: set IO ring size to valid value
  * net/ena/base: prevent allocation of zero sized memory
  * net/ena/base: make allocation macros thread-safe
  * net/ena: ensure Rx buffer size is at least 1400B

Signed-off-by: Michal Krawczyk <[email protected]>

userspace/dpdk/16.04/0001-Backport-ENA-PMD-to-v16.04.patch

@@ -1,7 +1,7 @@
 From 65a31061fe33969bfc2dc73862d5446f0327041c Mon Sep 17 00:00:00 2001
 From: Michal Krawczyk <[email protected]>
 Date: Mon, 4 Sep 2017 14:46:32 +0200
-Subject: [PATCH 01/14] Backport ENA PMD to v16.04
+Subject: [PATCH 01/21] Backport ENA PMD to v16.04
 
 The ENA PMD was backported from the commit:
 222555480a7f9979d10faa9bb8b9773b0e1aa058
@@ -27,7 +27,7 @@ net/ena: add memory initialization for the allocation macros
  11 files changed, 793 insertions(+), 728 deletions(-)
 
 diff --git a/drivers/net/ena/Makefile b/drivers/net/ena/Makefile
-index ac2b55dc7..bf1f5da07 100644
+index ac2b55dc7b..bf1f5da07c 100644
 --- a/drivers/net/ena/Makefile
 +++ b/drivers/net/ena/Makefile
 @@ -51,11 +51,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_ethdev.c
@@ -43,7 +43,7 @@ index ac2b55dc7..bf1f5da07 100644
 
  include $(RTE_SDK)/mk/rte.lib.mk
 diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
-index a21a95130..38a058775 100644
+index a21a951304..38a0587754 100644
 --- a/drivers/net/ena/base/ena_com.c
 +++ b/drivers/net/ena/base/ena_com.c
 @@ -42,9 +42,6 @@
@@ -667,7 +667,7 @@ index a21a95130..38a058775 100644
 
  	rc = ena_com_get_feature(ena_dev, &get_resp,
 diff --git a/drivers/net/ena/base/ena_com.h b/drivers/net/ena/base/ena_com.h
-index 19e53ffbf..e53459262 100644
+index 19e53ffbf7..e534592620 100644
 --- a/drivers/net/ena/base/ena_com.h
 +++ b/drivers/net/ena/base/ena_com.h
 @@ -120,8 +120,8 @@ struct ena_com_rx_buf_info {
@@ -850,7 +850,7 @@ index 19e53ffbf..e53459262 100644
  		ena_trc_err("Wrong moderation index %u\n", curr_moder_idx);
  		return;
 diff --git a/drivers/net/ena/base/ena_defs/ena_admin_defs.h b/drivers/net/ena/base/ena_defs/ena_admin_defs.h
-index fe4124697..7a031d903 100644
+index fe4124697a..7a031d903d 100644
 --- a/drivers/net/ena/base/ena_defs/ena_admin_defs.h
 +++ b/drivers/net/ena/base/ena_defs/ena_admin_defs.h
 @@ -58,30 +58,6 @@ enum ena_admin_aq_opcode {
@@ -1072,7 +1072,7 @@ index fe4124697..7a031d903 100644
 
  static inline uint16_t
 diff --git a/drivers/net/ena/base/ena_defs/ena_eth_io_defs.h b/drivers/net/ena/base/ena_defs/ena_eth_io_defs.h
-index a547033d1..6bc3d6a7c 100644
+index a547033d1c..6bc3d6a7cf 100644
 --- a/drivers/net/ena/base/ena_defs/ena_eth_io_defs.h
 +++ b/drivers/net/ena/base/ena_defs/ena_eth_io_defs.h
 @@ -87,28 +87,17 @@ struct ena_eth_io_tx_desc {
@@ -1848,7 +1848,7 @@ index a547033d1..6bc3d6a7c 100644
  #endif /* !defined(ENA_DEFS_LINUX_MAINLINE) */
  #endif /*_ENA_ETH_IO_H_ */
 diff --git a/drivers/net/ena/base/ena_defs/ena_gen_info.h b/drivers/net/ena/base/ena_defs/ena_gen_info.h
-index 4abdffed7..3d2520963 100644
+index 4abdffed77..3d25209632 100644
 --- a/drivers/net/ena/base/ena_defs/ena_gen_info.h
 +++ b/drivers/net/ena/base/ena_defs/ena_gen_info.h
 @@ -31,5 +31,5 @@
@@ -1860,7 +1860,7 @@ index 4abdffed7..3d2520963 100644
 +#define	ENA_GEN_DATE	"Sun Jun  5 10:24:39 IDT 2016"
 +#define	ENA_GEN_COMMIT	"17146ed"
 diff --git a/drivers/net/ena/base/ena_eth_com.c b/drivers/net/ena/base/ena_eth_com.c
-index 459e0bbb9..290a5666f 100644
+index 459e0bbb9d..290a5666fb 100644
 --- a/drivers/net/ena/base/ena_eth_com.c
 +++ b/drivers/net/ena/base/ena_eth_com.c
 @@ -62,7 +62,7 @@ static inline void ena_com_cq_inc_head(struct ena_com_io_cq *io_cq)
@@ -1964,7 +1964,7 @@ index 459e0bbb9..290a5666f 100644
  	ena_com_cq_inc_head(io_cq);
 
 diff --git a/drivers/net/ena/base/ena_eth_com.h b/drivers/net/ena/base/ena_eth_com.h
-index 325d69c0f..71a880c0f 100644
+index 325d69c0f5..71a880c0f1 100644
 --- a/drivers/net/ena/base/ena_eth_com.h
 +++ b/drivers/net/ena/base/ena_eth_com.h
 @@ -142,6 +142,20 @@ static inline int ena_com_update_dev_comp_head(struct ena_com_io_cq *io_cq)
@@ -1989,7 +1989,7 @@ index 325d69c0f..71a880c0f 100644
  {
  	io_sq->next_to_comp += elem;
 diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
-index aab2ac865..a812d75e2 100644
+index aab2ac8656..a812d75e2c 100644
 --- a/drivers/net/ena/base/ena_plat_dpdk.h
 +++ b/drivers/net/ena/base/ena_plat_dpdk.h
 @@ -62,10 +62,10 @@ typedef uint64_t dma_addr_t;
@@ -2096,7 +2096,7 @@ index aab2ac865..a812d75e2 100644
  static inline void writel(u32 value, volatile void  *addr)
  {
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index 02af67a24..8823c51cf 100644
+index 02af67a24b..8823c51cf8 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
 @@ -37,6 +37,8 @@
@@ -2917,7 +2917,7 @@ index 02af67a24..8823c51cf 100644
 
  PMD_REGISTER_DRIVER(ena_pmd_drv);
 diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h
-index ba6f01e66..dc3080ffd 100644
+index ba6f01e666..dc3080ffd3 100644
 --- a/drivers/net/ena/ena_ethdev.h
 +++ b/drivers/net/ena/ena_ethdev.h
 @@ -42,30 +42,12 @@

userspace/dpdk/16.04/0002-net-ena-do-not-set-Tx-L4-offloads-in-Rx-path.patch

@@ -1,7 +1,7 @@
 From 3941b2982c75bd966ab918e429f76acef8eb3a0e Mon Sep 17 00:00:00 2001
 From: Rafal Kozik <[email protected]>
 Date: Tue, 9 Jan 2018 16:19:08 +0100
-Subject: [PATCH 02/14] net/ena: do not set Tx L4 offloads in Rx path
+Subject: [PATCH 02/21] net/ena: do not set Tx L4 offloads in Rx path
 
 [ upstream commit fd617795679019c7aea5ab1e8c85db02cf53f169 ]
 
@@ -23,7 +23,7 @@ Signed-off-by: Michal Krawczyk <[email protected]>
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index 8823c51cf..9d677b8d7 100644
+index 8823c51cf8..9d677b8d7f 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
 @@ -258,16 +258,17 @@ static inline void ena_rx_mbuf_prepare(struct rte_mbuf *mbuf,

userspace/dpdk/16.04/0003-net-ena-check-pointer-before-memset.patch

@@ -1,7 +1,7 @@
 From 262082943426689695cb5d4688abceef809f0dab Mon Sep 17 00:00:00 2001
 From: Rafal Kozik <[email protected]>
 Date: Thu, 7 Jun 2018 11:43:18 +0200
-Subject: [PATCH 03/14] net/ena: check pointer before memset
+Subject: [PATCH 03/21] net/ena: check pointer before memset
 
 [ upstream commit 46916aa17d4b2007df8c0454f99ba0ca8b8cb93b ]
 
@@ -19,7 +19,7 @@ Acked-by: Michal Krawczyk <[email protected]>
  1 file changed, 16 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
-index a812d75e2..cc69b3372 100644
+index a812d75e2c..cc69b33726 100644
 --- a/drivers/net/ena/base/ena_plat_dpdk.h
 +++ b/drivers/net/ena/base/ena_plat_dpdk.h
 @@ -188,10 +188,15 @@ typedef uint64_t dma_addr_t;

userspace/dpdk/16.04/0004-net-ena-change-memory-type.patch

@@ -1,7 +1,7 @@
 From db52b57f5e85c103a254cf1f055dbd641a316881 Mon Sep 17 00:00:00 2001
 From: Rafal Kozik <[email protected]>
 Date: Thu, 7 Jun 2018 11:43:19 +0200
-Subject: [PATCH 04/14] net/ena: change memory type
+Subject: [PATCH 04/21] net/ena: change memory type
 
 [ upstream commit 9f32c7e7e6ce58ab772913f54f8328c1c0186a17 ]
 
@@ -22,7 +22,7 @@ Acked-by: Michal Krawczyk <[email protected]>
  1 file changed, 1 insertion(+), 7 deletions(-)
 
 diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
-index cc69b3372..ff873e807 100644
+index cc69b33726..ff873e807d 100644
 --- a/drivers/net/ena/base/ena_plat_dpdk.h
 +++ b/drivers/net/ena/base/ena_plat_dpdk.h
 @@ -223,14 +223,8 @@ typedef uint64_t dma_addr_t;

userspace/dpdk/16.04/0005-net-ena-fix-GENMASK_ULL-macro.patch

@@ -1,7 +1,7 @@
 From 0bdbbc2dd91c97c89fa5ca57e37013a4f204693c Mon Sep 17 00:00:00 2001
 From: Rafal Kozik <[email protected]>
 Date: Thu, 7 Jun 2018 11:43:20 +0200
-Subject: [PATCH 05/14] net/ena: fix GENMASK_ULL macro
+Subject: [PATCH 05/21] net/ena: fix GENMASK_ULL macro
 
 [ upstream commit 7544aee8d0b4ae0262b1ba7e1539cf8171664df7 ]
 
@@ -20,7 +20,7 @@ Acked-by: Michal Krawczyk <[email protected]>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
-index ff873e807..791b44ff7 100644
+index ff873e807d..791b44ff72 100644
 --- a/drivers/net/ena/base/ena_plat_dpdk.h
 +++ b/drivers/net/ena/base/ena_plat_dpdk.h
 @@ -115,11 +115,13 @@ typedef uint64_t dma_addr_t;

userspace/dpdk/16.04/0006-net-ena-set-link-speed-as-none.patch

@@ -1,7 +1,7 @@
 From 36c229d1eeb16670c7b3cc219cbe7287554e7738 Mon Sep 17 00:00:00 2001
 From: Rafal Kozik <[email protected]>
 Date: Thu, 7 Jun 2018 11:43:22 +0200
-Subject: [PATCH 06/14] net/ena: set link speed as none
+Subject: [PATCH 06/21] net/ena: set link speed as none
 
 [ upstream commit 41e59028dd8ab2038a7655c6fc3098222661aa53 ]
 
@@ -21,7 +21,7 @@ Acked-by: Michal Krawczyk <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index 9d677b8d7..98848e935 100644
+index 9d677b8d7f..98848e935f 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
 @@ -707,7 +707,7 @@ static int ena_link_update(struct rte_eth_dev *dev,

userspace/dpdk/16.04/0007-net-ena-fix-SIGFPE-with-0-Rx-queue.patch

@@ -1,7 +1,7 @@
 From f85679db3886449cdc79d112fbfb8170b256cf8a Mon Sep 17 00:00:00 2001
 From: Daria Kolistratova <[email protected]>
 Date: Tue, 26 Jun 2018 18:38:56 +0100
-Subject: [PATCH 07/14] net/ena: fix SIGFPE with 0 Rx queue
+Subject: [PATCH 07/21] net/ena: fix SIGFPE with 0 Rx queue
 
 [ upstream commit 361913ad6f8c05fc541fe4bfdae3b0dc095ae3af ]
 
@@ -19,7 +19,7 @@ Acked-by: Michal Krawczyk <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index 98848e935..3a257a9e5 100644
+index 98848e935f..3a257a9e57 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
 @@ -904,7 +904,7 @@ static int ena_start(struct rte_eth_dev *dev)

userspace/dpdk/16.04/0008-net-ena-fix-passing-RSS-hash-to-mbuf.patch

@@ -1,7 +1,7 @@
 From f32b3ec7c7dec3683b1cf2cd2e8de038d2ef3585 Mon Sep 17 00:00:00 2001
 From: Stewart Allen <[email protected]>
 Date: Thu, 25 Oct 2018 19:59:22 +0200
-Subject: [PATCH 08/14] net/ena: fix passing RSS hash to mbuf
+Subject: [PATCH 08/21] net/ena: fix passing RSS hash to mbuf
 
 [ upstream commit e5df9f33db00eb9d322abaefff30da74fd0e625d ]
 
@@ -19,7 +19,7 @@ Acked-by: Michal Krawczyk <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index 3a257a9e5..24e319764 100644
+index 3a257a9e57..24e3197649 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
 @@ -1559,7 +1559,7 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,

userspace/dpdk/16.04/0009-net-ena-add-supported-RSS-offloads-types.patch

@@ -1,7 +1,7 @@
 From 94a6f13df8511a16ccc97b79e83e4bc719fdff44 Mon Sep 17 00:00:00 2001
 From: Rafal Kozik <[email protected]>
 Date: Fri, 14 Dec 2018 14:18:38 +0100
-Subject: [PATCH 09/14] net/ena: add supported RSS offloads types
+Subject: [PATCH 09/21] net/ena: add supported RSS offloads types
 
 [ upstream commit b01ead202beb45346d7daeb2f2b1a608006af644 ]
 
@@ -20,7 +20,7 @@ Acked-by: Michal Krawczyk <[email protected]>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index 24e319764..e355c4c2f 100644
+index 24e3197649..e355c4c2f6 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
 @@ -1479,6 +1479,9 @@ static void ena_infos_get(struct rte_eth_dev *dev,

userspace/dpdk/16.04/0010-net-ena-fix-dev-init-with-multi-process.patch

@@ -1,7 +1,7 @@
 From 0904bb2a43de0893a768900a760170f3a15cb5ca Mon Sep 17 00:00:00 2001
 From: Michal Krawczyk <[email protected]>
 Date: Fri, 25 Jan 2019 09:10:25 +0100
-Subject: [PATCH 10/14] net/ena: fix dev init with multi-process
+Subject: [PATCH 10/21] net/ena: fix dev init with multi-process
 
 [ upstream commit fd9768905870856a2340266d25f8c0100dfccfff ]
 
@@ -22,7 +22,7 @@ Signed-off-by: Michal Krawczyk <[email protected]>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index e355c4c2f..dd0a9a27b 100644
+index e355c4c2f6..dd0a9a27bd 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
 @@ -1266,18 +1266,18 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)

userspace/dpdk/16.04/0011-net-ena-get-device-info-statically.patch

@@ -1,7 +1,7 @@
 From 647a39dd8e973f48fec3e54e3c55bcffeadb5a31 Mon Sep 17 00:00:00 2001
 From: Michal Krawczyk <[email protected]>
 Date: Fri, 15 Feb 2019 09:36:39 +0100
-Subject: [PATCH 11/14] net/ena: get device info statically
+Subject: [PATCH 11/21] net/ena: get device info statically
 
 [ upstream commit 117ba4a60488a0f96a5737f38ddba6d0f9a728b6 ]
 
@@ -22,7 +22,7 @@ Signed-off-by: Michal Krawczyk <[email protected]>
  2 files changed, 18 insertions(+), 19 deletions(-)
 
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index dd0a9a27b..6c986cfc0 100644
+index dd0a9a27bd..6c986cfc0e 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
 @@ -1348,9 +1348,14 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
@@ -84,7 +84,7 @@ index dd0a9a27b..6c986cfc0 100644
  			DEV_RX_OFFLOAD_UDP_CKSUM  |
  			DEV_RX_OFFLOAD_TCP_CKSUM;
 diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h
-index dc3080ffd..4791c53b5 100644
+index dc3080ffd3..4791c53b5a 100644
 --- a/drivers/net/ena/ena_ethdev.h
 +++ b/drivers/net/ena/ena_ethdev.h
 @@ -143,6 +143,12 @@ struct ena_stats_rx {

userspace/dpdk/16.04/0012-net-ena-fix-checksum-feature-flag.patch

@@ -1,7 +1,7 @@
 From ec0b65c55948813480d15c77633177a48af20731 Mon Sep 17 00:00:00 2001
 From: Michal Krawczyk <[email protected]>
 Date: Mon, 8 Apr 2019 12:27:44 +0200
-Subject: [PATCH 12/14] net/ena: fix checksum feature flag
+Subject: [PATCH 12/21] net/ena: fix checksum feature flag
 
 [ upstream commit ef538c1a7f565c9b58518375a500aa864445fd11 ]
 
@@ -18,7 +18,7 @@ Signed-off-by: Michal Krawczyk <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index 6c986cfc0..068641ee5 100644
+index 6c986cfc0e..068641ee51 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
 @@ -1353,7 +1353,7 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)

userspace/dpdk/16.04/0013-net-ena-fix-Rx-checksum-errors-statistics.patch

@@ -1,7 +1,7 @@
 From fc3dbe3a20809ea0457d4a117313d13b1fe8358e Mon Sep 17 00:00:00 2001
 From: Michal Krawczyk <[email protected]>
 Date: Tue, 28 May 2019 10:28:34 +0200
-Subject: [PATCH 13/14] net/ena: fix Rx checksum errors statistics
+Subject: [PATCH 13/21] net/ena: fix Rx checksum errors statistics
 
 [ upstream commit ef74b5f7b69b9502ddab81121611243efcfe1dde ]
 
@@ -21,7 +21,7 @@ Signed-off-by: Michal Krawczyk <[email protected]>
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index 068641ee5..2863ecbc9 100644
+index 068641ee51..2863ecbc99 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
 @@ -1555,6 +1555,11 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,

userspace/dpdk/16.04/0014-net-ena-fix-assigning-NUMA-node-to-IO-queue.patch

@@ -1,7 +1,7 @@
 From 964ad4e89de9d039667e12547a545c42926d8031 Mon Sep 17 00:00:00 2001
 From: Michal Krawczyk <[email protected]>
 Date: Tue, 4 Jun 2019 12:59:36 +0200
-Subject: [PATCH 14/14] net/ena: fix assigning NUMA node to IO queue
+Subject: [PATCH 14/21] net/ena: fix assigning NUMA node to IO queue
 
 [ upstream commit 4217cb0b7d2c5385f06f531af7f14b860927aba7 ]
 
@@ -23,7 +23,7 @@ Reviewed-by: David Marchand <[email protected]>
  2 files changed, 8 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index 2863ecbc9..ac21f0628 100644
+index 2863ecbc99..ac21f0628b 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
 @@ -38,7 +38,6 @@
@@ -106,7 +106,7 @@ index 2863ecbc9..ac21f0628 100644
 
  	rxq->rx_buffer_info = rte_zmalloc("rxq->buffer_info",
 diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h
-index 4791c53b5..8d5eb5a7c 100644
+index 4791c53b5a..8d5eb5a7ca 100644
 --- a/drivers/net/ena/ena_ethdev.h
 +++ b/drivers/net/ena/ena_ethdev.h
 @@ -90,6 +90,8 @@ struct ena_ring {