Merge branch 'master' into github-master

luigirizzo · Oct 2, 2015 · c104b27 · c104b27
2 parents 4902191 + 98dccbf
commit c104b27
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/LINUX/netmap_linux.c b/LINUX/netmap_linux.c
@@ -35,9 +35,6 @@
 
 #include "netmap_linux_config.h"
 
-#ifdef NETMAP_LINUX_HAVE_IOMMU
-#include <linux/iommu.h>
-
 void
 nm_os_ifnet_lock(void)
 {
@@ -99,6 +96,9 @@ nm_os_ifnet_fini(void)
 	}
 }
 
+#ifdef NETMAP_LINUX_HAVE_IOMMU
+#include <linux/iommu.h>
+
 /* #################### IOMMU ################## */
 /*
  * Returns the IOMMU domain id that the device belongs to.

diff --git a/extra/python/pktman.py b/extra/python/pktman.py
@@ -182,7 +182,7 @@ def netmap_remove_ifname_suffix(ifname_ext):
     handler['rx'] = receive
 
     # program arguments
-    parser = argparse.ArgumentParser(description = 'Send and receive packet using the netmap API')
+    parser = argparse.ArgumentParser(description = 'Send or receive packets using the netmap API')
     parser.add_argument('-i', '--interface', help = 'the interface to register with netmap; '
                         'can be in the form netmap:<OSNAME>[<EXT>] or <VALENAME>[<EXT>], where '
                         'OSNAME is the O.S. name for a network interface (e.g. "eth0"), '