From 029dfb01c0470b595889cade0c3dc43e36b9c899 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 30 Dec 2015 17:02:10 +0100 Subject: netmap-modules: fix build with kernel < 3.17 * define NETMAP_LINUX_ALLOC_NETDEV_4ARGS only when MACHINE is using kernel 3.17 or newer Signed-off-by: Martin Jansa --- meta-networking/recipes-kernel/netmap/netmap-modules_git.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb index 6e6f02ce5..5463dc130 100644 --- a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb +++ b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb @@ -61,7 +61,6 @@ do_configure_append () { #define NETMAP_LINUX_HAVE_PHYS_ADDR_T #define NETMAP_LINUX_HAVE_ACCESS_ONCE #define NETMAP_LINUX_HAVE_NETDEV_OPS -#define NETMAP_LINUX_ALLOC_NETDEV_4ARGS #define NETMAP_LINUX_HAVE_INIT_NET #define NETMAP_LINUX_HAVE_LIVE_ADDR_CHANGE #define NETMAP_LINUX_HAVE_TX_SKB_SHARING @@ -75,6 +74,12 @@ do_configure_append () { #define NETMAP_LINUX_HAVE_E1000E_EXT_RXDESC #define NETMAP_LINUX_HAVE_E1000E_DOWN2 EOF + +if ${@ 'false' if (bb.utils.vercmp_string(d.getVar('KERNEL_VERSION', True), '3.17') < 0) else 'true' } ; then + cat >> ${S}/LINUX/netmap_linux_config.h <