diff options
Diffstat (limited to 'debian/patches/0001-kni-fix-build-for-dev_open-in-Linux-5.0.patch')
| -rw-r--r-- | debian/patches/0001-kni-fix-build-for-dev_open-in-Linux-5.0.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/debian/patches/0001-kni-fix-build-for-dev_open-in-Linux-5.0.patch b/debian/patches/0001-kni-fix-build-for-dev_open-in-Linux-5.0.patch new file mode 100644 index 00000000..4fb3f29f --- /dev/null +++ b/debian/patches/0001-kni-fix-build-for-dev_open-in-Linux-5.0.patch @@ -0,0 +1,78 @@ +From d01c18ff821b81baa3b99329ebf051c6a1bfd4ee Mon Sep 17 00:00:00 2001 +From: Ferruh Yigit <ferruh.yigit@intel.com> +Date: Tue, 22 Jan 2019 15:44:28 +0000 +Subject: [PATCH 1/2] kni: fix build for dev_open in Linux 5.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Build error seen with Linux kernel 5.0 and +when CONFIG_RTE_KNI_KMOD_ETHTOOL is enabled. + +build error: +.../build/build/kernel/linux/kni/ixgbe_ethtool.c:1746:4: + error: too few arguments to function ‘dev_open’ + dev_open(netdev); + ^~~~~~~~ +In file included from .../build/kernel/linux/kni/ixgbe_ethtool.c:18: +.../linux/linux/include/linux/netdevice.h:2620:5: note: declared here + int dev_open(struct net_device *dev, struct netlink_ext_ack *extack); + ^~~~~~~~ + +.../build/build/kernel/linux/kni/igb_ethtool.c:1812:4: + error: too few arguments to function ‘dev_open’ + dev_open(netdev); + ^~~~~~~~ +In file included from .../build/build/kernel/linux/kni/igb_ethtool.c:15: +.../linux/linux/include/linux/netdevice.h:2620:5: note: declared here + int dev_open(struct net_device *dev, struct netlink_ext_ack *extack); + ^~~~~~~~ + +dev_open() is changed in Linux kernel version 5.0 and now requires +a new parameter, 'struct netlink_ext_ack *extack'. +Fixed by defining dev_open as macro when kernel version >= 5.0 + +Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> + +Origin: upstream, https://git.dpdk.org/dpdk/commit/?id=18cb8293e312bc3bd67211a5a540676f1c667d88 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1814919 +Last-Update: 2019-02-07 + +--- + kernel/linux/kni/ethtool/igb/kcompat.h | 4 ++++ + kernel/linux/kni/ethtool/ixgbe/kcompat.h | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h +index 430aabafe..068cfeb52 100644 +--- a/kernel/linux/kni/ethtool/igb/kcompat.h ++++ b/kernel/linux/kni/ethtool/igb/kcompat.h +@@ -3940,6 +3940,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) + #define HAVE_PCI_ENABLE_MSIX + #endif + ++#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) ) ++#define dev_open(x) dev_open(x, NULL) ++#endif /* >= 5.0.0 */ ++ + #if defined(timer_setup) && defined(from_timer) + #define HAVE_TIMER_SETUP + #endif +diff --git a/kernel/linux/kni/ethtool/ixgbe/kcompat.h b/kernel/linux/kni/ethtool/ixgbe/kcompat.h +index 7c7d6c317..419fd1f13 100644 +--- a/kernel/linux/kni/ethtool/ixgbe/kcompat.h ++++ b/kernel/linux/kni/ethtool/ixgbe/kcompat.h +@@ -3125,6 +3125,10 @@ static inline int __kc_pci_vfs_assigned(struct pci_dev *dev) + #define SET_ETHTOOL_OPS(netdev, ops) ((netdev)->ethtool_ops = (ops)) + #endif /* >= 3.16.0 */ + ++#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) ) ++#define dev_open(x) dev_open(x, NULL) ++#endif /* >= 5.0.0 */ ++ + /* + * vlan_tx_tag_* macros renamed to skb_vlan_tag_* (Linux commit: df8a39defad4) + * For older kernels backported this commit, need to use renamed functions. +-- +2.17.1 + |