src/sys/dev/netmap/netmap_monitor.c, branch releng/10.2 FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=releng%2F10.2 2015-02-14T19:41:26Z sync the code with the version in head. which the exception of 2015-02-14T19:41:26Z Luigi Rizzo luigi@FreeBSD.org 2015-02-14T19:41:26Z urn:sha1:a4f75310c142e8ae7279e23f965ce606f2db8bd6 svn 275358 (M_FLOWID deprecation, only a couple of lines) which cannot be merged. if_lem_netmap.h, if_re_netmap.h: - use the same (commented out) function to update the stat counters as in HEAD. This is a no-op here netmap.c - merge 274459 (support for private knote lock) and minor changes on nm_config and comments netmap_freebsd.c - merge 274459 (support for private knote lock) - merge 274354 (initialize color if passed as argument) netmap_generic.c - fix a comment netmap_kern.h - revise the lock macros, using sx locks; merge 274459 (private knote lock) netmap_monitor.c - use full memory barriers netmap_pipe.c - use full memory barriers, use length from the correct queue (mostly cosmetic, since the queues typically have the same size) MFC 270063: update of netmap code 2014-08-20T23:34:36Z Luigi Rizzo luigi@FreeBSD.org 2014-08-20T23:34:36Z urn:sha1:609deef53d143a87415f58ae8d9915879345d227 (vtnet and cxgbe not merged yet because we need some other mfc first)