Module Name: src
Committed By: ozaki-r
Date: Mon Jun 16 03:43:10 UTC 2014
Modified Files:
src/sys/net: if.h if_bridgevar.h
Log Message:
Include pktqueue.h only if _KERNEL
To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/sys/net/if.h
cvs rdiff -u -r1.16 -r1.17 src/sys/net/if_bridgevar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.166 src/sys/net/if.h:1.167
--- src/sys/net/if.h:1.166 Mon Jun 16 00:40:10 2014
+++ src/sys/net/if.h Mon Jun 16 03:43:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.166 2014/06/16 00:40:10 ozaki-r Exp $ */
+/* $NetBSD: if.h,v 1.167 2014/06/16 03:43:10 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -82,7 +82,9 @@
#include <net/dlt.h>
#include <net/pfil.h>
+#ifdef _KERNEL
#include <net/pktqueue.h>
+#endif
/*
* Always include ALTQ glue here -- we use the ALTQ interface queue
Index: src/sys/net/if_bridgevar.h
diff -u src/sys/net/if_bridgevar.h:1.16 src/sys/net/if_bridgevar.h:1.17
--- src/sys/net/if_bridgevar.h:1.16 Mon Jun 16 01:03:57 2014
+++ src/sys/net/if_bridgevar.h Mon Jun 16 03:43:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridgevar.h,v 1.16 2014/06/16 01:03:57 ozaki-r Exp $ */
+/* $NetBSD: if_bridgevar.h,v 1.17 2014/06/16 03:43:10 ozaki-r Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -78,8 +78,6 @@
#include <sys/callout.h>
#include <sys/queue.h>
-#include <net/pktqueue.h>
-
/*
* Commands used in the SIOCSDRVSPEC ioctl. Note the lookup of the
* bridge interface itself is keyed off the ifdrv structure.
@@ -207,6 +205,8 @@ struct ifbrparam {
#define ifbrp_filter ifbrp_ifbrpu.ifbrpu_int32 /* filtering flags */
#ifdef _KERNEL
+#include <net/pktqueue.h>
+
/*
* Timekeeping structure used in spanning tree code.
*/
