From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 19 19:24:49 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 88F2FF7F; Mon, 19 Nov 2012 19:24:49 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 535FE8FC13; Mon, 19 Nov 2012 19:24:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJJOntv027652; Mon, 19 Nov 2012 19:24:49 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJJOnjY027650; Mon, 19 Nov 2012 19:24:49 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201211191924.qAJJOnjY027650@svn.freebsd.org> From: Ed Maste Date: Mon, 19 Nov 2012 19:24:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r243301 - stable/9/sys/dev/netmap X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2012 19:24:49 -0000 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;