Merge branch 'next' into master

adapt to the counter interface on FreeBSD head (commented out, anyways)

remove stale comment

remove trailing whitespace

This tag points to the commit which preceeds the merge with the

newapi3 branch. It's useful for binaries compiled with the
old netmap API.

newapi apparently working