From 2ddb009591c7614d76bc64f22494724fb3c019ea Mon Sep 17 00:00:00 2001
From: "Federico G. Schwindt" <fgsch@cvs.openbsd.org>
Date: Tue, 23 Nov 2004 21:12:24 +0000
Subject: replace old net/if_ieee80211.h header with the net80211 ones, kernel
 part. millert@ mcbride@ jsg@

---
 sys/arch/macppc/dev/if_wi_obio.c | 4 ++--
 sys/dev/ic/awi.c                 | 4 ++--
 sys/dev/ic/awi_wep.c             | 4 ++--
 sys/dev/ic/if_wi.c               | 7 ++++---
 sys/dev/ic/if_wi_hostap.c        | 5 +++--
 sys/dev/pci/if_wi_pci.c          | 5 +++--
 sys/dev/pcmcia/if_awi_pcmcia.c   | 4 ++--
 sys/dev/pcmcia/if_ray.c          | 5 +++--
 sys/dev/pcmcia/if_wi_pcmcia.c    | 5 +++--
 sys/dev/usb/if_wi_usb.c          | 5 +++--
 10 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/sys/arch/macppc/dev/if_wi_obio.c b/sys/arch/macppc/dev/if_wi_obio.c
index 21973974e92..378994745cf 100644
--- a/sys/arch/macppc/dev/if_wi_obio.c
+++ b/sys/arch/macppc/dev/if_wi_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_obio.c,v 1.11 2004/10/20 13:41:51 deraadt Exp $	*/
+/*	$OpenBSD: if_wi_obio.c,v 1.12 2004/11/23 21:12:23 fgsch Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -60,7 +60,7 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <net/if_ieee80211.h>
+#include <net80211/ieee80211.h>
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
diff --git a/sys/dev/ic/awi.c b/sys/dev/ic/awi.c
index 48dd80eb1bc..198ca7cb7b9 100644
--- a/sys/dev/ic/awi.c
+++ b/sys/dev/ic/awi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: awi.c,v 1.14 2004/09/23 17:45:16 brad Exp $	*/
+/*	$OpenBSD: awi.c,v 1.15 2004/11/23 21:12:23 fgsch Exp $	*/
 /*	$NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $	*/
 
 /*-
@@ -137,7 +137,7 @@
 #endif
 #endif
 
-#include <net/if_ieee80211.h>
+#include <net80211/ieee80211.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/ic/awi_wep.c b/sys/dev/ic/awi_wep.c
index c2b48047898..708cf24041f 100644
--- a/sys/dev/ic/awi_wep.c
+++ b/sys/dev/ic/awi_wep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: awi_wep.c,v 1.11 2004/09/18 21:52:57 tedu Exp $	*/
+/*	$OpenBSD: awi_wep.c,v 1.12 2004/11/23 21:12:23 fgsch Exp $	*/
 /*	$NetBSD: awi_wep.c,v 1.2 2000/07/04 14:47:58 onoe Exp $	*/
 
 /*
@@ -77,7 +77,7 @@
 #include <net/if_ether.h>
 #endif
 #include <net/if_media.h>
-#include <net/if_ieee80211.h>
+#include <net80211/ieee80211.h>
 
 #include <machine/cpu.h>
 #include <machine/bus.h>
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 9a6632f150b..897ad56e355 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi.c,v 1.112 2004/10/20 12:53:28 deraadt Exp $	*/
+/*	$OpenBSD: if_wi.c,v 1.113 2004/11/23 21:12:23 fgsch Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -87,7 +87,8 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <net/if_ieee80211.h>
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_ioctl.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
@@ -126,7 +127,7 @@ u_int32_t	widebug = WIDEBUG;
 
 #if !defined(lint) && !defined(__OpenBSD__)
 static const char rcsid[] =
-	"$OpenBSD: if_wi.c,v 1.112 2004/10/20 12:53:28 deraadt Exp $";
+	"$OpenBSD: if_wi.c,v 1.113 2004/11/23 21:12:23 fgsch Exp $";
 #endif	/* lint */
 
 #ifdef foo
diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c
index 6afb63386e2..e35ae4c0c5b 100644
--- a/sys/dev/ic/if_wi_hostap.c
+++ b/sys/dev/ic/if_wi_hostap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_hostap.c,v 1.29 2004/03/15 21:53:28 millert Exp $	*/
+/*	$OpenBSD: if_wi_hostap.c,v 1.30 2004/11/23 21:12:23 fgsch Exp $	*/
 
 /*
  * Copyright (c) 2002
@@ -68,7 +68,8 @@
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 
-#include <net/if_ieee80211.h>
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_ioctl.h>
 
 #include <dev/rndvar.h>
 
diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c
index 96728771ad6..0cf16c47de6 100644
--- a/sys/dev/pci/if_wi_pci.c
+++ b/sys/dev/pci/if_wi_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_pci.c,v 1.38 2004/10/20 13:19:53 jsg Exp $	*/
+/*	$OpenBSD: if_wi_pci.c,v 1.39 2004/11/23 21:12:23 fgsch Exp $	*/
 
 /*
  * Copyright (c) 2001-2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -55,7 +55,8 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <net/if_ieee80211.h>
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_ioctl.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c
index c9fe377af7b..890bbdced37 100644
--- a/sys/dev/pcmcia/if_awi_pcmcia.c
+++ b/sys/dev/pcmcia/if_awi_pcmcia.c
@@ -1,5 +1,5 @@
 /* $NetBSD: if_awi_pcmcia.c,v 1.13 2000/03/22 11:22:20 onoe Exp $ */
-/* $OpenBSD: if_awi_pcmcia.c,v 1.12 2003/10/22 09:58:46 jmc Exp $ */
+/* $OpenBSD: if_awi_pcmcia.c,v 1.13 2004/11/23 21:12:23 fgsch Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#include <net/if_ieee80211.h>
+#include <net80211/ieee80211.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c
index 4a91f5c7a36..8850f1538c8 100644
--- a/sys/dev/pcmcia/if_ray.c
+++ b/sys/dev/pcmcia/if_ray.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ray.c,v 1.24 2004/06/05 20:23:00 mcbride Exp $	*/
+/*	$OpenBSD: if_ray.c,v 1.25 2004/11/23 21:12:23 fgsch Exp $	*/
 /*	$NetBSD: if_ray.c,v 1.21 2000/07/05 02:35:54 onoe Exp $	*/
 
 /*
@@ -87,7 +87,8 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <net/if_ieee80211.h>	/* here, since ETHER_ADDR_LEN is in netinet */
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_ioctl.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index 4f77dd20df5..c9a2c5e9b86 100644
--- a/sys/dev/pcmcia/if_wi_pcmcia.c
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_pcmcia.c,v 1.55 2004/10/22 08:48:38 jsg Exp $ */
+/* $OpenBSD: if_wi_pcmcia.c,v 1.56 2004/11/23 21:12:23 fgsch Exp $ */
 /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */
 
 /*
@@ -58,7 +58,8 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <net/if_ieee80211.h>
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_ioctl.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index 470874821df..4df700eb262 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_usb.c,v 1.15 2004/10/20 12:59:13 jsg Exp $ */
+/*	$OpenBSD: if_wi_usb.c,v 1.16 2004/11/23 21:12:23 fgsch Exp $ */
 
 /*
  * Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -60,7 +60,8 @@
 
 #define ROUNDUP64(x) (((x)+63) & ~63)
 
-#include <net/if_ieee80211.h>
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_ioctl.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
-- 
cgit v1.2.3