From owner-svn-src-user@FreeBSD.ORG  Sun Nov 23 00:23:58 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 744801065672;
	Sun, 23 Nov 2008 00:23:58 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 61CB88FC0A;
	Sun, 23 Nov 2008 00:23:58 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAN0Nwc9033505;
	Sun, 23 Nov 2008 00:23:58 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAN0NwBC033504;
	Sun, 23 Nov 2008 00:23:58 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811230023.mAN0NwBC033504@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 23 Nov 2008 00:23:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185195 - user/kmacy/HEAD_fast_multi_xmit/sys/sys
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Nov 2008 00:23:58 -0000

Author: kmacy
Date: Sun Nov 23 00:23:58 2008
New Revision: 185195
URL: http://svn.freebsd.org/changeset/base/185195

Log:
  - fix buf_ring_peek
  - don't enable debugging

Modified:
  user/kmacy/HEAD_fast_multi_xmit/sys/sys/buf_ring.h

Modified: user/kmacy/HEAD_fast_multi_xmit/sys/sys/buf_ring.h
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/sys/sys/buf_ring.h	Sun Nov 23 00:22:52 2008	(r185194)
+++ user/kmacy/HEAD_fast_multi_xmit/sys/sys/buf_ring.h	Sun Nov 23 00:23:58 2008	(r185195)
@@ -56,8 +56,6 @@
   #error "unknown compiler"
 #endif
 
-#define DEBUG_BUFRING 1
-
 #if defined(INVARIANTS) && !defined(DEBUG_BUFRING)
 #define DEBUG_BUFRING 1
 #endif
@@ -245,7 +243,10 @@ buf_ring_peek(struct buf_ring *br)
 		panic("lock not held on single consumer dequeue");
 #endif	
 	mb();
-	return (br->br_ring[br->br_cons_tail]);
+	if (br->br_cons_head == br->br_prod_tail)
+		return (NULL);
+	
+	return (br->br_ring[br->br_cons_head]);
 }
 
 static __inline int