From owner-svn-src-head@FreeBSD.ORG Tue Jun 3 05:19:11 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 653E9735; Tue, 3 Jun 2014 05:19:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A55F2C9B; Tue, 3 Jun 2014 05:19:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s535JBpP050906; Tue, 3 Jun 2014 05:19:11 GMT (envelope-from sobomax@svn.freebsd.org) Received: (from sobomax@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s535JB7H050905; Tue, 3 Jun 2014 05:19:11 GMT (envelope-from sobomax@svn.freebsd.org) Message-Id: <201406030519.s535JB7H050905@svn.freebsd.org> From: Maxim Sobolev Date: Tue, 3 Jun 2014 05:19:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267001 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2014 05:19:11 -0000 Author: sobomax Date: Tue Jun 3 05:19:10 2014 New Revision: 267001 URL: http://svnweb.freebsd.org/changeset/base/267001 Log: Fix few outdated names of defines: o NR_REG_SW_NIC -> NR_REG_SW o NR_RING_NIC_SW -> NR_REG_NIC_SW o NETMAP_NO_TX_SYNC -> NETMAP_NO_TX_POLL o NETMAP_DO_RX_SYNC -> NETMAP_DO_RX_POLL I hope dear luigi has not left those as an excercise to careful reader, in which case I apologize in advance for ruining his play. MFC after: 1 week Modified: head/share/man/man4/netmap.4 Modified: head/share/man/man4/netmap.4 ============================================================================== --- head/share/man/man4/netmap.4 Tue Jun 3 04:38:13 2014 (r267000) +++ head/share/man/man4/netmap.4 Tue Jun 3 05:19:10 2014 (r267001) @@ -612,9 +612,9 @@ In the example below, "netmap:foo" is an .Bl -tag -width XXXXX .It NR_REG_ALL_NIC "netmap:foo" (default) all hardware ring pairs -.It NR_REG_SW_NIC "netmap:foo^" +.It NR_REG_SW "netmap:foo^" the ``host rings'', connecting to the host stack. -.It NR_RING_NIC_SW "netmap:foo+ +.It NR_REG_NIC_SW "netmap:foo+ all hardware rings and the host rings .It NR_REG_ONE_NIC "netmap:foo-i" only the i-th hardware ring pair, where the number is in @@ -639,7 +639,7 @@ or call pushes out any pending packets on the transmit ring, even if no write events are specified. The feature can be disabled by or-ing -.Va NETMAP_NO_TX_SYNC +.Va NETMAP_NO_TX_POLL to the value written to .Va nr_ringid. When this feature is used, @@ -679,13 +679,13 @@ are supported too. .Pp Packets in transmit rings are normally pushed out (and buffers reclaimed) even without -requesting write events. Passing the NETMAP_NO_TX_SYNC flag to +requesting write events. Passing the NETMAP_NO_TX_POLL flag to .Em NIOCREGIF disables this feature. By default, receive rings are processed only if read -events are requested. Passing the NETMAP_DO_RX_SYNC flag to +events are requested. Passing the NETMAP_DO_RX_POLL flag to .Em NIOCREGIF updates receive rings even without read events. -Note that on epoll and kqueue, NETMAP_NO_TX_SYNC and NETMAP_DO_RX_SYNC +Note that on epoll and kqueue, NETMAP_NO_TX_POLL and NETMAP_DO_RX_POLL only have an effect when some event is posted for the file descriptor. .Sh LIBRARIES The