49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From: Ferruh Yigit <ferruh.yigit@intel.com>
|
|
Date: Wed, 12 Feb 2020 17:14:24 +0000
|
|
Message-Id: <20200212171424.695556-1-ferruh.yigit@intel.com>
|
|
Subject: [dpdk-dev] [PATCH] kni: fix build with Linux 5.6
|
|
|
|
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@intel.com>
|
|
Acked-by: David Marchand <david.marchand@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 7109474ec..9ee45dbf6 100644
|
|
--- a/kernel/linux/kni/compat.h
|
|
+++ b/kernel/linux/kni/compat.h
|
|
@@ -130,3 +130,7 @@
|
|
#if KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE
|
|
#define HAVE_IOVA_TO_KVA_MAPPING_SUPPORT
|
|
#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 97fe85be9..c82c881a2 100644
|
|
--- a/kernel/linux/kni/kni_net.c
|
|
+++ b/kernel/linux/kni/kni_net.c
|
|
@@ -623,8 +623,13 @@ 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
|
|
{
|
|
pr_debug("Transmit timeout at %ld, latency %ld\n", jiffies,
|
|
jiffies - dev_trans_start(dev));
|