Ethernet drivers no longer need to include if_vlan_var.h for the VLAN

definitions; ok mpi@

7 files changed, 7 insertions, 27 deletions

diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index 1720916168c..7199077baaa 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_age.c,v 1.31 2015/11/25 03:09:59 dlg Exp $	*/
+/*	$OpenBSD: if_age.c,v 1.32 2016/03/15 16:45:52 naddy Exp $	*/
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -53,8 +53,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#include <net/if_vlan_var.h>
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index c7452555726..f4bdbd2364e 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_alc.c,v 1.37 2015/11/25 03:09:59 dlg Exp $	*/
+/*	$OpenBSD: if_alc.c,v 1.38 2016/03/15 16:45:52 naddy Exp $	*/
 /*-
  * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -52,8 +52,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#include <net/if_vlan_var.h>
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index 97919a11123..5f742694594 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ale.c,v 1.42 2015/11/25 03:09:59 dlg Exp $	*/
+/*	$OpenBSD: if_ale.c,v 1.43 2016/03/15 16:45:52 naddy Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -56,8 +56,6 @@
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 
-#include <net/if_vlan_var.h>
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index 0e67e4ee34c..9c14ca2504c 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_jme.c,v 1.45 2015/11/25 03:09:59 dlg Exp $	*/
+/*	$OpenBSD: if_jme.c,v 1.46 2016/03/15 16:45:52 naddy Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -53,8 +53,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#include <net/if_vlan_var.h>
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_vio.c b/sys/dev/pci/if_vio.c
index 4cd80d579db..65e1b88724a 100644
--- a/sys/dev/pci/if_vio.c
+++ b/sys/dev/pci/if_vio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vio.c,v 1.39 2015/11/25 03:09:59 dlg Exp $	*/
+/*	$OpenBSD: if_vio.c,v 1.40 2016/03/15 16:45:52 naddy Exp $	*/
 
 /*
  * Copyright (c) 2012 Stefan Fritsch, Alexander Fiveg.
@@ -50,10 +50,6 @@
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 
-#if NVLAN > 0
-#include <net/if_vlan_var.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 1f3717e3699..406182e2aaa 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vr.c,v 1.150 2016/01/26 01:52:10 dlg Exp $	*/
+/*	$OpenBSD: if_vr.c,v 1.151 2016/03/15 16:45:52 naddy Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -78,10 +78,6 @@
 #include <netinet/if_ether.h>
 #include <net/if_media.h>
 
-#if NVLAN > 0
-#include <net/if_vlan_var.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/pci/ixgbe.h b/sys/dev/pci/ixgbe.h
index 1ab95cbbf7e..83901b60a80 100644
--- a/sys/dev/pci/ixgbe.h
+++ b/sys/dev/pci/ixgbe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ixgbe.h,v 1.21 2015/12/18 19:08:36 kettenis Exp $	*/
+/*	$OpenBSD: ixgbe.h,v 1.22 2016/03/15 16:45:52 naddy Exp $	*/
 
 /******************************************************************************
 
@@ -66,10 +66,6 @@
 #include <net/bpf.h>
 #endif
 
-#if NVLAN > 0
-#include <net/if_vlan_var.h>
-#endif
-
 typedef int	boolean_t;
 #define TRUE	1
 #define FALSE	0