Signed-off-by: Anuj Mittal <[email protected]> --- .../0001-kni-fix-build-with-Linux-5.6.patch | 57 ------------------- .../dpdk/{dpdk_19.11.0.bb => dpdk_19.11.1.bb} | 6 +- 2 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 recipes-extended/dpdk/dpdk/0001-kni-fix-build-with-Linux-5.6.patch rename recipes-extended/dpdk/{dpdk_19.11.0.bb => dpdk_19.11.1.bb} (81%)
diff --git a/recipes-extended/dpdk/dpdk/0001-kni-fix-build-with-Linux-5.6.patch b/recipes-extended/dpdk/dpdk/0001-kni-fix-build-with-Linux-5.6.patch deleted file mode 100644 index 28897cb..0000000 --- a/recipes-extended/dpdk/dpdk/0001-kni-fix-build-with-Linux-5.6.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 38ad54f3bc7614b53bd6ca3644a471a3842502fc Mon Sep 17 00:00:00 2001 -From: Ferruh Yigit <[email protected]> -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: [email protected] - -Signed-off-by: Ferruh Yigit <[email protected]> -Acked-by: David Marchand <[email protected]> - -Upstream-Status: Backport [38ad54f3bc7614b53bd6ca3644a471a3842502fc] - -Signed-off-by: He Zhe <[email protected]> ---- - 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 - diff --git a/recipes-extended/dpdk/dpdk_19.11.0.bb b/recipes-extended/dpdk/dpdk_19.11.1.bb similarity index 81% rename from recipes-extended/dpdk/dpdk_19.11.0.bb rename to recipes-extended/dpdk/dpdk_19.11.1.bb index 9046ae1..1ac1a93 100644 --- a/recipes-extended/dpdk/dpdk_19.11.0.bb +++ b/recipes-extended/dpdk/dpdk_19.11.1.bb @@ -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 -- 2.25.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6499): https://lists.yoctoproject.org/g/meta-intel/message/6499 Mute This Topic: https://lists.yoctoproject.org/mt/73141413/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
