From 415dfa833a1d0490a33a5feb920141b61c2bc30c Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Tue, 3 Jun 2014 05:19:10 +0000 Subject: [PATCH] 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 --- share/man/man4/netmap.4 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/share/man/man4/netmap.4 b/share/man/man4/netmap.4 index 1b2dc7a23da7..1943ebc95ba7 100644 --- a/share/man/man4/netmap.4 +++ b/share/man/man4/netmap.4 @@ -612,9 +612,9 @@ In the example below, "netmap:foo" is any valid netmap port name. .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