mirror of
git://git.yoctoproject.org/meta-dpdk.git
synced 2025-07-04 20:54:47 +02:00
dpdk/19.11: upgrade 19.11.0 -> 19.11.1
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
parent
b11f6044df
commit
a84fef2b5f
|
@ -1,57 +0,0 @@
|
|||
From 38ad54f3bc7614b53bd6ca3644a471a3842502fc Mon Sep 17 00:00:00 2001
|
||||
From: Ferruh Yigit <ferruh.yigit@intel.com>
|
||||
Date: Wed, 12 Feb 2020 17:14:24 +0000
|
||||
Subject: [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.
|
||||
|
||||
Cc: stable@dpdk.org
|
||||
|
||||
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
|
||||
Acked-by: David Marchand <david.marchand@redhat.com>
|
||||
|
||||
Upstream-Status: Backport [38ad54f3bc7614b53bd6ca3644a471a3842502fc]
|
||||
|
||||
Signed-off-by: He Zhe <zhe.he@windriver.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 7109474..9ee45db 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 97fe85b..c82c881 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));
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -3,15 +3,15 @@ include dpdk.inc
|
|||
CONFIG_NAME = "common_linux"
|
||||
TEST_DIR = "app/test"
|
||||
|
||||
SRCREV = "7001c8fdb27357c67147c0a13cb3826e48c0f2bf"
|
||||
STABLE = "-stable"
|
||||
BRANCH = "19.11"
|
||||
SRCREV = "622b78505c37571bdceaf0166012095ce08e2b28"
|
||||
|
||||
LICENSE = "BSD-3-Clause & LGPLv2.1 & GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
|
||||
file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
|
||||
|
||||
SRC_URI += "file://0001-kni-fix-build-with-Linux-5.6.patch"
|
||||
|
||||
do_install_append () {
|
||||
# Remove the unneeded dir
|
||||
rm -rf ${D}/${INSTALL_PATH}/${RTE_TARGET}/app
|
Loading…
Reference in New Issue
Block a user