svn commit: r243306 - stable/9/sys/dev/netmap

Ed Maste emaste at FreeBSD.org
Mon Nov 19 19:31:55 UTC 2012


Author: emaste
Date: Mon Nov 19 19:31:55 2012
New Revision: 243306
URL: http://svnweb.freebsd.org/changeset/base/243306

Log:
  MFC r239242: Reword comment to try to improve clarity, and fix a typo.

Modified:
  stable/9/sys/dev/netmap/ixgbe_netmap.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/netmap/ixgbe_netmap.h
==============================================================================
--- stable/9/sys/dev/netmap/ixgbe_netmap.h	Mon Nov 19 19:31:54 2012	(r243305)
+++ stable/9/sys/dev/netmap/ixgbe_netmap.h	Mon Nov 19 19:31:55 2012	(r243306)
@@ -198,14 +198,17 @@ fail:
  * Reconcile kernel and user view of the transmit ring.
  * This routine might be called frequently so it must be efficient.
  *
- * Userspace has filled tx slots up to ring->cur (excluded).
- * The last unused slot previously known to the kernel was kring->nkr_hwcur,
- * and the last interrupt reported kring->nr_hwavail slots available.
+ * ring->cur holds the userspace view of the current ring index.  Userspace
+ * has filled the tx slots from the previous call's ring->cur up to but not
+ * including ring->cur for this call.  In this function the kernel updates
+ * kring->nr_hwcur to ring->cur, thus slots [kring->nr_hwcur, ring->cur) are
+ * now ready to transmit.  At the last interrupt kring->nr_hwavail slots were
+ * available.
  *
  * This function runs under lock (acquired from the caller or internally).
  * It must first update ring->avail to what the kernel knows,
- * subtract the newly used slots (ring->cur - kring->nkr_hwcur)
- * from both avail and nr_hwavail, and set ring->nkr_hwcur = ring->cur
+ * subtract the newly used slots (ring->cur - kring->nr_hwcur)
+ * from both avail and nr_hwavail, and set ring->nr_hwcur = ring->cur
  * issuing a dmamap_sync on all slots.
  *
  * Since ring comes from userspace, its content must be read only once,


More information about the svn-src-stable-9 mailing list