svn commit: r239140 - head/sys/dev/netmap

Ed Maste emaste at FreeBSD.org
Wed Aug 8 15:27:02 UTC 2012


Author: emaste
Date: Wed Aug  8 15:27:01 2012
New Revision: 239140
URL: http://svn.freebsd.org/changeset/base/239140

Log:
  Clarify comments about number of tx / rx rings

Modified:
  head/sys/dev/netmap/netmap.c
  head/sys/dev/netmap/netmap_kern.h

Modified: head/sys/dev/netmap/netmap.c
==============================================================================
--- head/sys/dev/netmap/netmap.c	Wed Aug  8 13:54:26 2012	(r239139)
+++ head/sys/dev/netmap/netmap.c	Wed Aug  8 15:27:01 2012	(r239140)
@@ -1282,7 +1282,8 @@ netmap_lock_wrapper(struct ifnet *dev, i
  * kring	N+1	is only used for the selinfo for all queues.
  * Return 0 on success, ENOMEM otherwise.
  *
- * na->num_tx_rings can be set for cards with different tx/rx setups
+ * By default the receive and transmit adapter ring counts are both initialized  * to num_queues.  na->num_tx_rings can be set for cards with different tx/rx
+ * setups.
  */
 int
 netmap_attach(struct netmap_adapter *na, int num_queues)

Modified: head/sys/dev/netmap/netmap_kern.h
==============================================================================
--- head/sys/dev/netmap/netmap_kern.h	Wed Aug  8 13:54:26 2012	(r239139)
+++ head/sys/dev/netmap/netmap_kern.h	Wed Aug  8 15:27:01 2012	(r239140)
@@ -144,8 +144,8 @@ struct netmap_adapter {
 	int separate_locks; /* set if the interface suports different
 			       locks for rx, tx and core. */
 
-	u_int num_rx_rings; /* number of tx/rx ring pairs */
-	u_int num_tx_rings; // if nonzero, overrides num_rx_rings
+	u_int num_rx_rings; /* number of adapter receive rings */
+	u_int num_tx_rings; /* number of adapter transmit rings */
 
 	u_int num_tx_desc; /* number of descriptor in each queue */
 	u_int num_rx_desc;


More information about the svn-src-all mailing list