diff options
Diffstat (limited to 'debian/patches/lp-1827102-kni-fix-build-with-Linux-5.1.patch')
-rw-r--r-- | debian/patches/lp-1827102-kni-fix-build-with-Linux-5.1.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/debian/patches/lp-1827102-kni-fix-build-with-Linux-5.1.patch b/debian/patches/lp-1827102-kni-fix-build-with-Linux-5.1.patch deleted file mode 100644 index c06448a7..00000000 --- a/debian/patches/lp-1827102-kni-fix-build-with-Linux-5.1.patch +++ /dev/null @@ -1,73 +0,0 @@ -From db9178c24c1643b5ef58f2a9ff87c3eef8e0e1e4 Mon Sep 17 00:00:00 2001 -From: Ferruh Yigit <ferruh.yigit@intel.com> -Date: Mon, 8 Apr 2019 15:22:26 +0100 -Subject: [PATCH] kni: fix build with Linux 5.1 - -Build error seen with Linux kernel 5.1 and -when CONFIG_RTE_KNI_KMOD_ETHTOOL is enabled. - -Build error: -kernel/linux/kni/igb_main.c:2352:18: - error: initialization of ... from incompatible pointer type ... - [-Werror=incompatible-pointer-types] - .ndo_fdb_add = igb_ndo_fdb_add, - ^~~~~~~~~~~~~~~ - -ndo_fdb_add() is changed in Linux kernel version 5.1 and now requires -a new parameter, 'struct netlink_ext_ack *extack': -Linux Commit 87b0984ebfab ("net: Add extack argument to ndo_fdb_add()") - -ndo_fdb_add() parameter updated with compile time Linux kernel version -check. - -Cc: stable@dpdk.org - -Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> -Tested-by: Bruce Richardson <bruce.richardson@intel.com> -Reviewed-by: Rami Rosen <ramirose@gmail.com> - -Origin: upstream, https://git.dpdk.org/dpdk/commit/?id=db9178c24c1643b5ef58f2a9ff87c3eef8e0e1e4 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1827102 -Last-Update: 2019-05-03 - ---- - kernel/linux/kni/ethtool/igb/igb_main.c | 6 ++++++ - kernel/linux/kni/ethtool/igb/kcompat.h | 4 ++++ - 2 files changed, 10 insertions(+) - -diff --git a/kernel/linux/kni/ethtool/igb/igb_main.c b/kernel/linux/kni/ethtool/igb/igb_main.c -index 0b4faeae5..cda2b063d 100644 ---- a/kernel/linux/kni/ethtool/igb/igb_main.c -+++ b/kernel/linux/kni/ethtool/igb/igb_main.c -@@ -2112,7 +2112,13 @@ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], - #ifdef HAVE_NDO_FDB_ADD_VID - u16 vid, - #endif -+#ifdef HAVE_NDO_FDB_ADD_EXTACK -+ u16 flags, -+ struct netlink_ext_ack *extack) -+#else - u16 flags) -+#endif -+ - #else - static int igb_ndo_fdb_add(struct ndmsg *ndm, - struct net_device *dev, -diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h -index 11b15f3a9..649a69c81 100644 ---- a/kernel/linux/kni/ethtool/igb/kcompat.h -+++ b/kernel/linux/kni/ethtool/igb/kcompat.h -@@ -3945,6 +3945,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) - #define HAVE_NDO_BRIDGE_SETLINK_EXTACK - #endif /* >= 5.0.0 */ - -+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0) ) -+#define HAVE_NDO_FDB_ADD_EXTACK -+#endif /* >= 5.1.0 */ -+ - #if defined(timer_setup) && defined(from_timer) - #define HAVE_TIMER_SETUP - #endif --- -2.21.0 - |