Add conditional compile define for netmap API version < 11

appneta · Sep 5, 2014 · 4d25e6f · 4d25e6f
1 parent 8b7e028
commit 4d25e6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -1,4 +1,5 @@
 09/05/2014 Version 4.0.5
+    - Fix build failure with latest netmap 11 (#123)
     - Fix unable to use Zero Copy interfaces on PF_RING (#118)
     - Corrected build for latest version of PF_RING (#81)
     - Proper error message when vale is unconfigured (#113)

diff --git a/src/common/netmap.h b/src/common/netmap.h
@@ -48,6 +48,7 @@
 
 #ifndef HAVE_NETMAP_NR_REG
 #define NR_REG_MASK     0xf     /* values for nr_flags */
+#if NETMAP_API < 11
 enum {  NR_REG_DEFAULT  = 0,    /* backward compat, used in older versions. */
     NR_REG_ALL_NIC,
     NR_REG_SW,
@@ -56,6 +57,7 @@ enum {  NR_REG_DEFAULT  = 0,    /* backward compat, used in older versions. */
     NR_REG_PIPE_MASTER,
     NR_REG_PIPE_SLAVE,
 };
+#endif /* NETMAP_API < 11 */
 #endif
 
 #ifndef NETMAP_HW_RING