Author: emaste
Date: Mon Nov 19 19:24:48 2012
New Revision: 243301
URL: http://svnweb.freebsd.org/changeset/base/243301
Log:
MFC r239140: Clarify comments about number of tx / rx rings
MFC r239141: Fix whitespace (missing newline)
Sponsored by: ADARA Networks
Modified:
stable/9/sys/dev/netmap/netmap.c
stable/9/sys/dev/netmap/netmap_kern.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/netmap/netmap.c
==============================================================================
--- stable/9/sys/dev/netmap/netmap.c Mon Nov 19 19:19:04 2012
(r243300)
+++ stable/9/sys/dev/netmap/netmap.c Mon Nov 19 19:24:48 2012
(r243301)
@@ -976,7 +976,9 @@ 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: stable/9/sys/dev/netmap/netmap_kern.h
==============================================================================
--- stable/9/sys/dev/netmap/netmap_kern.h Mon Nov 19 19:19:04 2012
(r243300)
+++ stable/9/sys/dev/netmap/netmap_kern.h Mon Nov 19 19:24:48 2012
(r243301)
@@ -118,8 +118,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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
