From owner-svn-src-user@FreeBSD.ORG  Sun Dec  7 05:46:18 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 2D54F1065672;
	Sun,  7 Dec 2008 05:46:18 +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 1CDBA8FC12;
	Sun,  7 Dec 2008 05:46:18 +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 mB75kIOJ015583;
	Sun, 7 Dec 2008 05:46:18 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB75kItP015582;
	Sun, 7 Dec 2008 05:46:18 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812070546.mB75kItP015582@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 7 Dec 2008 05:46:18 +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: r185732 - user/kmacy/HEAD_fast_multi_xmit/sys/net
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, 07 Dec 2008 05:46:18 -0000

Author: kmacy
Date: Sun Dec  7 05:46:17 2008
New Revision: 185732
URL: http://svn.freebsd.org/changeset/base/185732

Log:
  don't leak buf ring in to user namespace

Modified:
  user/kmacy/HEAD_fast_multi_xmit/sys/net/if_var.h

Modified: user/kmacy/HEAD_fast_multi_xmit/sys/net/if_var.h
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/sys/net/if_var.h	Sun Dec  7 05:27:32 2008	(r185731)
+++ user/kmacy/HEAD_fast_multi_xmit/sys/net/if_var.h	Sun Dec  7 05:46:17 2008	(r185732)
@@ -77,12 +77,12 @@ struct  ifvlantrunk;
 #ifdef _KERNEL
 #include <sys/mbuf.h>
 #include <sys/eventhandler.h>
+#include <sys/buf_ring.h>
 #endif /* _KERNEL */
 #include <sys/lock.h>		/* XXX */
 #include <sys/mutex.h>		/* XXX */
 #include <sys/event.h>		/* XXX */
 #include <sys/_task.h>
-#include <sys/buf_ring.h>
 
 #define	IF_DUNIT_NONE	-1
 
@@ -542,6 +542,7 @@ do {									\
 } while (0)
 
 
+#ifdef _KERNEL
 static __inline int
 drbr_enqueue(struct buf_ring *br, struct mbuf *m)
 {	
@@ -565,9 +566,7 @@ drbr_free(struct buf_ring *br, struct ma
 
 	buf_ring_free(br, type);
 }
-
-
-
+#endif
 
 /*
  * 72 was chosen below because it is the size of a TCP/IP