From 00bed2565c771c9a7a890faa30ba32dfd6da9022 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 20 Nov 2015 10:52:00 +0100
Subject: [PATCH] netmap: ring size limit not enough for multi-queue em(4)

Also mutes a spammy message.  Bravely going where no man
has gone before.  :)
---
 sys/dev/netmap/netmap.c      | 2 +-
 sys/dev/netmap/netmap_kern.h | 1 +
 sys/dev/netmap/netmap_mem2.c | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c
index aff757bdadf..4cc9726e990 100644
--- a/sys/dev/netmap/netmap.c
+++ b/sys/dev/netmap/netmap.c
@@ -2920,7 +2920,7 @@ netmap_transmit(struct ifnet *ifp, struct mbuf *m)
         if (space < 0)
                 space += kring->nkr_num_slots;
 	if (space + mbq_len(q) >= kring->nkr_num_slots - 1) { // XXX
-		RD(10, "%s full hwcur %d hwtail %d qlen %d len %d m %p",
+		NRD(10, "%s full hwcur %d hwtail %d qlen %d len %d m %p",
 			na->name, kring->nr_hwcur, kring->nr_hwtail, mbq_len(q),
 			len, m);
 	} else {
diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h
index f2e699874f8..fb26ec11e27 100644
--- a/sys/dev/netmap/netmap_kern.h
+++ b/sys/dev/netmap/netmap_kern.h
@@ -182,6 +182,7 @@ struct hrtimer {
 	} while (0)
 
 /* rate limited, lps indicates how many per second */
+#define NRD(lps, format, ...)
 #define RD(lps, format, ...)					\
 	do {							\
 		static int t0, __cnt;				\
diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c
index 023604d4953..96f8226c395 100644
--- a/sys/dev/netmap/netmap_mem2.c
+++ b/sys/dev/netmap/netmap_mem2.c
@@ -282,7 +282,7 @@ struct netmap_obj_params netmap_params[NETMAP_POOLS_NR] = {
 		.num  = 100,
 	},
 	[NETMAP_RING_POOL] = {
-		.size = 9*PAGE_SIZE,
+		.size = 18*PAGE_SIZE,
 		.num  = 200,
 	},
 	[NETMAP_BUF_POOL] = {