[dpdk-stable] patch 'kni: fix build with Linux 5.6' has been queued to LTS release 18.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.7

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

Thanks.

Kevin.

---
>From 6ff755242707bbf6ff99edc58be5c1d8d791f8b8 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Wed, 12 Feb 2020 17:14:24 +0000
Subject: [PATCH] kni: fix build with Linux 5.6

[ upstream commit 38ad54f3bc7614b53bd6ca3644a471a3842502fc ]

With the following Linux commit a new parameter 'txqueue' has been added
to 'ndo_tx_timeout' ndo:
commit 0290bd291cc0 ("netdev: pass the stuck queue to the timeout handler")

The change reflected to the KNI with version check.

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 kernel/linux/kni/compat.h  | 4 ++++
 kernel/linux/kni/kni_net.c | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
index 3c575c70a2..3c3855dcfa 100644
--- a/kernel/linux/kni/compat.h
+++ b/kernel/linux/kni/compat.h
@@ -118,2 +118,6 @@
 #define HAVE_SIGNAL_FUNCTIONS_OWN_HEADER
 #endif
+
+#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE
+#define HAVE_TX_TIMEOUT_TXQUEUE
+#endif
diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index f3f2f73c7b..dba6a9c838 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -597,6 +597,11 @@ kni_net_rx(struct kni_dev *kni)
  * Deal with a transmit timeout.
  */
+#ifdef HAVE_TX_TIMEOUT_TXQUEUE
+static void
+kni_net_tx_timeout(struct net_device *dev, unsigned int txqueue)
+#else
 static void
 kni_net_tx_timeout(struct net_device *dev)
+#endif
 {
 	struct kni_dev *kni = netdev_priv(dev);
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-19 15:43:49.904839818 +0000
+++ 0003-kni-fix-build-with-Linux-5.6.patch	2020-02-19 15:43:49.715142317 +0000
@@ -1 +1 @@
-From 38ad54f3bc7614b53bd6ca3644a471a3842502fc Mon Sep 17 00:00:00 2001
+From 6ff755242707bbf6ff99edc58be5c1d8d791f8b8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 38ad54f3bc7614b53bd6ca3644a471a3842502fc ]
+
@@ -12,2 +13,0 @@
-Cc: stable at dpdk.org
-
@@ -22 +22 @@
-index 7109474ec5..9ee45dbf6f 100644
+index 3c575c70a2..3c3855dcfa 100644
@@ -25,2 +25,2 @@
-@@ -131,2 +131,6 @@
- #define HAVE_IOVA_TO_KVA_MAPPING_SUPPORT
+@@ -118,2 +118,6 @@
+ #define HAVE_SIGNAL_FUNCTIONS_OWN_HEADER
@@ -33 +33 @@
-index 97fe85be9a..c82c881a2c 100644
+index f3f2f73c7b..dba6a9c838 100644
@@ -36 +36 @@
-@@ -624,6 +624,11 @@ kni_net_rx(struct kni_dev *kni)
+@@ -597,6 +597,11 @@ kni_net_rx(struct kni_dev *kni)
@@ -47 +47 @@
- 	pr_debug("Transmit timeout at %ld, latency %ld\n", jiffies,
+ 	struct kni_dev *kni = netdev_priv(dev);