summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-12-30 17:02:10 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-01-14 11:22:38 +0100
commit029dfb01c0470b595889cade0c3dc43e36b9c899 (patch)
treee20b40d2d2bb4ae8229224e0c5816c24ef54c2ca
parentb556364b72dd1600eac2602add0e137daf721adc (diff)
downloadmeta-openembedded-029dfb01c0470b595889cade0c3dc43e36b9c899.tar.gz
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 <Martin.Jansa@gmail.com>
-rw-r--r--meta-networking/recipes-kernel/netmap/netmap-modules_git.bb7
1 files changed, 6 insertions, 1 deletions
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 () {
61#define NETMAP_LINUX_HAVE_PHYS_ADDR_T 61#define NETMAP_LINUX_HAVE_PHYS_ADDR_T
62#define NETMAP_LINUX_HAVE_ACCESS_ONCE 62#define NETMAP_LINUX_HAVE_ACCESS_ONCE
63#define NETMAP_LINUX_HAVE_NETDEV_OPS 63#define NETMAP_LINUX_HAVE_NETDEV_OPS
64#define NETMAP_LINUX_ALLOC_NETDEV_4ARGS
65#define NETMAP_LINUX_HAVE_INIT_NET 64#define NETMAP_LINUX_HAVE_INIT_NET
66#define NETMAP_LINUX_HAVE_LIVE_ADDR_CHANGE 65#define NETMAP_LINUX_HAVE_LIVE_ADDR_CHANGE
67#define NETMAP_LINUX_HAVE_TX_SKB_SHARING 66#define NETMAP_LINUX_HAVE_TX_SKB_SHARING
@@ -75,6 +74,12 @@ do_configure_append () {
75#define NETMAP_LINUX_HAVE_E1000E_EXT_RXDESC 74#define NETMAP_LINUX_HAVE_E1000E_EXT_RXDESC
76#define NETMAP_LINUX_HAVE_E1000E_DOWN2 75#define NETMAP_LINUX_HAVE_E1000E_DOWN2
77EOF 76EOF
77
78if ${@ 'false' if (bb.utils.vercmp_string(d.getVar('KERNEL_VERSION', True), '3.17') < 0) else 'true' } ; then
79 cat >> ${S}/LINUX/netmap_linux_config.h <<EOF
80#define NETMAP_LINUX_ALLOC_NETDEV_4ARGS
81EOF
82fi
78} 83}
79 84
80do_compile () { 85do_compile () {