[dpdk-stable] patch 'kni: fix build on RHEL 8.3' 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 12/16/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/dcd493e5059e4a2818e2df5b36179056184a7aae

Thanks.

Kevin.

---
>From dcd493e5059e4a2818e2df5b36179056184a7aae Mon Sep 17 00:00:00 2001
From: Olivier Matz <olivier.matz at 6wind.com>
Date: Thu, 26 Nov 2020 15:23:45 +0100
Subject: [PATCH] kni: fix build on RHEL 8.3

[ upstream commit 95e0871929bfd9891545c9cbfe97119cb72390ba ]

Like what was done for mainline kernel in commit 38ad54f3bc76 ("kni: fix
build with Linux 5.6"), a new parameter 'txqueue' has to be added to
'ndo_tx_timeout' ndo on RHEL 8.3 kernel.

Signed-off-by: Olivier Matz <olivier.matz at 6wind.com>
Tested-by: Christophe Grosse <christophe.grosse at 6wind.com>
Tested-by: David Marchand <david.marchand at redhat.com>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 kernel/linux/kni/compat.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
index bf5e6e2b17..953b2cb614 100644
--- a/kernel/linux/kni/compat.h
+++ b/kernel/linux/kni/compat.h
@@ -122,5 +122,7 @@
 #endif
 
-#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || \
+	(defined(RHEL_RELEASE_CODE) && \
+	 RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE)
 #define HAVE_TX_TIMEOUT_TXQUEUE
 #endif
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-12-15 12:52:22.038740663 +0000
+++ 0003-kni-fix-build-on-RHEL-8.3.patch	2020-12-15 12:52:21.951978719 +0000
@@ -1 +1 @@
-From 95e0871929bfd9891545c9cbfe97119cb72390ba Mon Sep 17 00:00:00 2001
+From dcd493e5059e4a2818e2df5b36179056184a7aae Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 95e0871929bfd9891545c9cbfe97119cb72390ba ]
+
@@ -10,2 +11,0 @@
-Cc: stable at dpdk.org
-
@@ -21 +21 @@
-index d515b27669..5f65640d5e 100644
+index bf5e6e2b17..953b2cb614 100644
@@ -24 +24 @@
-@@ -132,5 +132,7 @@
+@@ -122,5 +122,7 @@