Please ignore. Zhe
On 3/24/20 5:14 PM, He Zhe wrote: > From: He Zhe <[email protected]> > > kernel/linux/kni/kni_net.c:786:20: error: initialization of > 'void (*)(struct net_device *, unsigned int)' from incompatible pointer type > 'void (*)(struct net_device *)' [-Werror=incompatible-pointer-types] > 786 | .ndo_tx_timeout = kni_net_tx_timeout, > | ^~~~~~~~~~~~~~~~~~ > > Signed-off-by: He Zhe <[email protected]> > --- > .../dpdk/0001-kni-fix-build-with-Linux-5.6.patch | 53 > ++++++++++++++++++++++ > recipes-extended/dpdk/dpdk_19.11.0.bb | 2 + > 2 files changed, 55 insertions(+) > create mode 100644 > recipes-extended/dpdk/dpdk/0001-kni-fix-build-with-Linux-5.6.patch > > 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 > new file mode 100644 > index 0000000..2d2c7ef > --- /dev/null > +++ b/recipes-extended/dpdk/dpdk/0001-kni-fix-build-with-Linux-5.6.patch > @@ -0,0 +1,53 @@ > +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]> > +--- > + 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.0.bb > index 7a6b9d8..9046ae1 100644 > --- a/recipes-extended/dpdk/dpdk_19.11.0.bb > +++ b/recipes-extended/dpdk/dpdk_19.11.0.bb > @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = > "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4 > > 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 > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6438): https://lists.yoctoproject.org/g/meta-intel/message/6438 Mute This Topic: https://lists.yoctoproject.org/mt/72513341/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
