-commit d55e43ec530094f2f2b8eb13524de74c0b208ada
-Author: Vincenzo Maffione <v.maffione@gmail.com>
-Date:   Tue Jan 3 17:47:31 2017 +0100
-
-    add netmap support
-
 diff --git a/INSTALL.NETMAP b/INSTALL.NETMAP
 new file mode 100644
-index 0000000..b3e95c2
+index 000000000..314531daf
 --- /dev/null
 +++ b/INSTALL.NETMAP
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,43 @@
 +                   Using Open vSwitch with netmap (VALE)
 +                   ============================
 +
 +Open vSwitch can use VALE, a software switch that runs in a kernel
-+ to accelerate its datapath.
++to accelerate its datapath.
 +Thanks to efficient packet I/O based on netmap API and a novel
 +packet forwarding algorithm, VALE accelerates Open vSwitch datapath
 +by three times when forwarding short packets between 10 Gbps NICs.

+int ovs_vale_ctl(const char *, int, int);
+int ovs_vale_send(struct net_device *, struct sk_buff *skb);
diff --git a/datapath/linux/Kbuild.in b/datapath/linux/Kbuild.in
index 9e3259f..19e5933 100644
--- a/datapath/linux/Kbuild.in
+++ b/datapath/linux/Kbuild.in
@@ -13,6 +13,13 @@ ccflags-y += -I$(builddir)/..
 ccflags-y += -g
 ccflags-y += -include $(builddir)/kcompat.h
 
+ifneq (@NETMAP_DIR@,)
+NETMAP_DIR := @NETMAP_DIR@
+EXTRA_CFLAGS += -I$(NETMAP_DIR) -I$(NETMAP_DIR)/LINUX -I$(NETMAP_DIR)/sys -I$(NETMAP_DIR)/sys/dev -DDEV_NETMAP -DWITH_VALE
+#EXTRA_CFLAGS += -I$(NETMAP_DIR) -I$(NETMAP_DIR)/sys -I$(NETMAP_DIR)/sys/dev -DDEV_NETMAP -DNETMAP_API_4
+KBUILD_EXTRA_SYMBOLS = $(NETMAP_DIR)/Module.symvers
+endif
+

 struct vport *ovs_internal_dev_get_vport(struct net_device *netdev)
diff --git a/datapath/vport-internal_dev_netmap.h b/datapath/vport-internal_dev_netmap.h
new file mode 100644
index 000000000..2f26d906b
--- /dev/null
+++ b/datapath/vport-internal_dev_netmap.h
@@ -0,0 +1,66 @@
