svn commit: r185732 - user/kmacy/HEAD_fast_multi_xmit/sys/net

Kip Macy kmacy at FreeBSD.org
Sat Dec 6 21:46:18 PST 2008


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


More information about the svn-src-user mailing list