From dfc6f41febc6e43836c677d09528266b0613ed64 Mon Sep 17 00:00:00 2001
From: Martin Pieuchot <mpi@cvs.openbsd.org>
Date: Sat, 14 Nov 2015 17:54:58 +0000
Subject: Do not include <net/if_vlan_var.h> when it's not necessary.

Because of the VLAN hacks in mpw(4) this file still contains the definition
of "struct ifvlan" which depends on <sys/refcnt.h> which in turns pull
<sys/atomic.h>...
---
 sys/dev/pci/if_bge.c    | 7 +------
 sys/dev/pci/if_bnxreg.h | 7 +------
 sys/dev/pci/if_em.h     | 7 +------
 sys/dev/pci/if_et.c     | 3 +--
 sys/dev/pci/if_ixgb.h   | 7 +------
 sys/dev/pci/if_msk.c    | 3 +--
 sys/dev/pci/if_nfe.c    | 7 +------
 sys/dev/pci/if_nge.c    | 7 +------
 sys/dev/pci/if_oce.c    | 7 +------
 sys/dev/pci/if_sk.c     | 3 +--
 sys/dev/pci/if_stge.c   | 7 +------
 sys/dev/pci/if_txp.c    | 6 +-----
 sys/dev/pci/if_vge.c    | 7 +------
 sys/dev/pci/if_vmx.c    | 4 +---
 sys/dev/pci/if_vte.c    | 5 +----
 sys/dev/pci/if_xge.c    | 7 +------
 16 files changed, 16 insertions(+), 78 deletions(-)

(limited to 'sys/dev/pci')

diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index b5c7aaba774..846f69cb5d8 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bge.c,v 1.373 2015/11/12 19:55:48 miod Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.374 2015/11/14 17:54:57 mpi Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -92,11 +92,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#if NVLAN > 0
-#include <net/if_types.h>
-#include <net/if_vlan_var.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_bnxreg.h b/sys/dev/pci/if_bnxreg.h
index 29873b2d70e..14a4e23d3b4 100644
--- a/sys/dev/pci/if_bnxreg.h
+++ b/sys/dev/pci/if_bnxreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bnxreg.h,v 1.46 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: if_bnxreg.h,v 1.47 2015/11/14 17:54:57 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006 Broadcom Corporation
@@ -58,11 +58,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#if NVLAN > 0
-#include <net/if_types.h>
-#include <net/if_vlan_var.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_em.h b/sys/dev/pci/if_em.h
index 7f0ab234add..fa8d440f305 100644
--- a/sys/dev/pci/if_em.h
+++ b/sys/dev/pci/if_em.h
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 /* $FreeBSD: if_em.h,v 1.26 2004/09/01 23:22:41 pdeuskar Exp $ */
-/* $OpenBSD: if_em.h,v 1.58 2015/09/30 11:25:08 kettenis Exp $ */
+/* $OpenBSD: if_em.h,v 1.59 2015/11/14 17:54:57 mpi Exp $ */
 
 #ifndef _EM_H_DEFINED_
 #define _EM_H_DEFINED_
@@ -60,11 +60,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 
-#if NVLAN > 0
-#include <net/if_types.h>
-#include <net/if_vlan_var.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c
index 5036941c5d7..73f584113e1 100644
--- a/sys/dev/pci/if_et.c
+++ b/sys/dev/pci/if_et.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_et.c,v 1.30 2015/10/25 13:04:28 mpi Exp $	*/
+/*	$OpenBSD: if_et.c,v 1.31 2015/11/14 17:54:57 mpi Exp $	*/
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
  * 
@@ -62,7 +62,6 @@
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
-#include <net/if_vlan_var.h>
  
 #include <dev/mii/miivar.h>
 
diff --git a/sys/dev/pci/if_ixgb.h b/sys/dev/pci/if_ixgb.h
index 19c6c47487e..7891f19ebe8 100644
--- a/sys/dev/pci/if_ixgb.h
+++ b/sys/dev/pci/if_ixgb.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_ixgb.h,v 1.17 2014/12/26 05:46:32 tedu Exp $ */
+/* $OpenBSD: if_ixgb.h,v 1.18 2015/11/14 17:54:57 mpi Exp $ */
 
 #ifndef _IXGB_H_DEFINED_
 #define _IXGB_H_DEFINED_
@@ -59,11 +59,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 
-#if NVLAN > 0
-#include <net/if_types.h>
-#include <net/if_vlan_var.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index a66a3b99dc9..948c23ad786 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_msk.c,v 1.117 2015/10/25 13:04:28 mpi Exp $	*/
+/*	$OpenBSD: if_msk.c,v 1.118 2015/11/14 17:54:57 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -107,7 +107,6 @@
 #include <netinet/if_ether.h>
 
 #include <net/if_media.h>
-#include <net/if_vlan_var.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 2d4a5fbd3e9..b33bfc9a321 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nfe.c,v 1.112 2015/10/25 13:04:28 mpi Exp $	*/
+/*	$OpenBSD: if_nfe.c,v 1.113 2015/11/14 17:54:57 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -43,11 +43,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#if NVLAN > 0
-#include <net/if_types.h>
-#include <net/if_vlan_var.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index 5e4e8cc7ce6..d573d5955df 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nge.c,v 1.86 2015/10/25 13:04:28 mpi Exp $	*/
+/*	$OpenBSD: if_nge.c,v 1.87 2015/11/14 17:54:57 mpi Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -107,11 +107,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#if NVLAN > 0
-#include <net/if_types.h>
-#include <net/if_vlan_var.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c
index 32e0bcdd10e..1f3ed555153 100644
--- a/sys/dev/pci/if_oce.c
+++ b/sys/dev/pci/if_oce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_oce.c,v 1.88 2015/10/25 13:04:28 mpi Exp $	*/
+/*	$OpenBSD: if_oce.c,v 1.89 2015/11/14 17:54:57 mpi Exp $	*/
 
 /*
  * Copyright (c) 2012 Mike Belopuhov
@@ -83,11 +83,6 @@
 #include <net/bpf.h>
 #endif
 
-#if NVLAN > 0
-#include <net/if_types.h>
-#include <net/if_vlan_var.h>
-#endif
-
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 42d833e9381..1dba8e67a28 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sk.c,v 1.178 2015/10/25 13:04:28 mpi Exp $	*/
+/*	$OpenBSD: if_sk.c,v 1.179 2015/11/14 17:54:57 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -107,7 +107,6 @@
 #include <netinet/if_ether.h>
 
 #include <net/if_media.h>
-#include <net/if_vlan_var.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index 510670e0c4f..5c6db61ba53 100644
--- a/sys/dev/pci/if_stge.c
+++ b/sys/dev/pci/if_stge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_stge.c,v 1.62 2015/10/25 13:04:28 mpi Exp $	*/
+/*	$OpenBSD: if_stge.c,v 1.63 2015/11/14 17:54:57 mpi Exp $	*/
 /*	$NetBSD: if_stge.c,v 1.27 2005/05/16 21:35:32 bouyer Exp $	*/
 
 /*-
@@ -58,11 +58,6 @@
 
 #include <net/if_media.h>
 
-#if NVLAN > 0
-#include <net/if_types.h>
-#include <net/if_vlan_var.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index bc2b781a77e..03724f54fe0 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_txp.c,v 1.117 2015/10/25 13:04:28 mpi Exp $	*/
+/*	$OpenBSD: if_txp.c,v 1.118 2015/11/14 17:54:57 mpi Exp $	*/
 
 /*
  * Copyright (c) 2001
@@ -57,10 +57,6 @@
 #include <net/bpf.h>
 #endif
 
-#if NVLAN > 0
-#include <net/if_vlan_var.h>
-#endif
-
 #include <machine/bus.h>
 
 #include <dev/mii/mii.h>
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index e77ece54627..ae46a037c50 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vge.c,v 1.65 2015/10/25 13:04:28 mpi Exp $	*/
+/*	$OpenBSD: if_vge.c,v 1.66 2015/11/14 17:54:57 mpi Exp $	*/
 /*	$FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $	*/
 /*
  * Copyright (c) 2004
@@ -102,11 +102,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#if NVLAN > 0
-#include <net/if_types.h>
-#include <net/if_vlan_var.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c
index aaec622ceaf..0a951a130d8 100644
--- a/sys/dev/pci/if_vmx.c
+++ b/sys/dev/pci/if_vmx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vmx.c,v 1.34 2015/10/25 13:04:28 mpi Exp $	*/
+/*	$OpenBSD: if_vmx.c,v 1.35 2015/11/14 17:54:57 mpi Exp $	*/
 
 /*
  * Copyright (c) 2013 Tsubai Masanari
@@ -38,8 +38,6 @@
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 
-#include <net/if_vlan_var.h>
-
 #include <machine/bus.h>
 
 #include <dev/pci/if_vmxreg.h>
diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c
index ef4a69c4167..3724e44d891 100644
--- a/sys/dev/pci/if_vte.c
+++ b/sys/dev/pci/if_vte.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vte.c,v 1.14 2015/10/25 13:04:28 mpi Exp $	*/
+/*	$OpenBSD: if_vte.c,v 1.15 2015/11/14 17:54:57 mpi Exp $	*/
 /*-
  * Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -52,9 +52,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#include <net/if_types.h>
-#include <net/if_vlan_var.h>
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index a39ea365dbf..d5e9963ce67 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xge.c,v 1.63 2015/10/25 13:04:28 mpi Exp $	*/
+/*	$OpenBSD: if_xge.c,v 1.64 2015/11/14 17:54:57 mpi Exp $	*/
 /*	$NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $	*/
 
 /*
@@ -59,11 +59,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#if NVLAN > 0
-#include <net/if_types.h>
-#include <net/if_vlan_var.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
-- 
cgit v1.2.3