diff options
author | luigi <luigi@FreeBSD.org> | 2014-06-09 15:24:45 +0000 |
---|---|---|
committer | luigi <luigi@FreeBSD.org> | 2014-06-09 15:24:45 +0000 |
commit | ebbf6b80b7c61883bee08d58e7291d274b4201a0 (patch) | |
tree | a448df913c38e0849c39af93fd624da3bf845225 /sys/dev/netmap/netmap_mem2.c | |
parent | 2472187c4f707df7b460212773ffae872c03d247 (diff) | |
download | FreeBSD-src-ebbf6b80b7c61883bee08d58e7291d274b4201a0.zip FreeBSD-src-ebbf6b80b7c61883bee08d58e7291d274b4201a0.tar.gz |
sync netmap code with the version in HEAD:
- fix handling of tx mbufs in emulated netmap mode;
- introduce mbq_lock() and mbq_unlock()
- rate limit some error messages
- many whitespace and comment fixes
Diffstat (limited to 'sys/dev/netmap/netmap_mem2.c')
-rw-r--r-- | sys/dev/netmap/netmap_mem2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c index 5491845..d237794 100644 --- a/sys/dev/netmap/netmap_mem2.c +++ b/sys/dev/netmap/netmap_mem2.c @@ -992,7 +992,7 @@ netmap_mem_private_new(const char *name, u_int txr, u_int txd, if (p[NETMAP_RING_POOL].num < v) p[NETMAP_RING_POOL].num = v; /* for each pipe we only need the buffers for the 4 "real" rings. - * On the other end, the pipe ring dimension may be different from + * On the other end, the pipe ring dimension may be different from * the parent port ring dimension. As a compromise, we allocate twice the * space actually needed if the pipe rings were the same size as the parent rings */ |