PERFORCE change 130280 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=130280

Change 130280 by sam at sam_ebb on 2007/12/05 17:37:29

	move opt_wlan.h include into code; can't do it in ieee80211_freebsd.h
	because code outside net80211 uses it (e.g. drivers)

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211.c#17 edit
.. //depot/projects/vap/sys/net80211/ieee80211_acl.c#7 edit
.. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_amrr.c#5 edit
.. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#9 edit
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_ccmp.c#9 edit
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_none.c#9 edit
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_tkip.c#9 edit
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_wep.c#9 edit
.. //depot/projects/vap/sys/net80211/ieee80211_dfs.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#14 edit
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#13 edit
.. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#5 edit
.. //depot/projects/vap/sys/net80211/ieee80211_input.c#23 edit
.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#19 edit
.. //depot/projects/vap/sys/net80211/ieee80211_monitor.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_node.c#17 edit
.. //depot/projects/vap/sys/net80211/ieee80211_output.c#20 edit
.. //depot/projects/vap/sys/net80211/ieee80211_power.c#7 edit
.. //depot/projects/vap/sys/net80211/ieee80211_proto.c#17 edit
.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#4 edit
.. //depot/projects/vap/sys/net80211/ieee80211_scan.c#12 edit
.. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#14 edit
.. //depot/projects/vap/sys/net80211/ieee80211_sta.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_wds.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_xauth.c#7 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211.c#17 (text+ko) ====

@@ -30,6 +30,7 @@
 /*
  * IEEE 802.11 generic handler
  */
+#include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 

==== //depot/projects/vap/sys/net80211/ieee80211_acl.c#7 (text+ko) ====

@@ -37,6 +37,8 @@
  * and if found the frame is either accepted (ACL_POLICY_ALLOW)
  * or rejected (ACL_POLICY_DENT).
  */
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h> 

==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  * IEEE 802.11 IBSS mode support.
  */
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 

==== //depot/projects/vap/sys/net80211/ieee80211_amrr.c#5 (text+ko) ====

@@ -28,6 +28,8 @@
  *  INRIA Sophia - Projet Planete
  *  http://www-sop.inria.fr/rapports/sophia/RR-5208.html
  */
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/module.h>

==== //depot/projects/vap/sys/net80211/ieee80211_crypto.c#9 (text+ko) ====

@@ -30,6 +30,8 @@
 /*
  * IEEE 802.11 generic crypto support.
  */
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>

==== //depot/projects/vap/sys/net80211/ieee80211_crypto_ccmp.c#9 (text+ko) ====

@@ -33,6 +33,8 @@
  * AP driver. The code is used with the consent of the author and
  * it's license is included below.
  */
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   

==== //depot/projects/vap/sys/net80211/ieee80211_crypto_none.c#9 (text+ko) ====

@@ -29,6 +29,8 @@
 /*
  * IEEE 802.11 NULL crypto support.
  */
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   

==== //depot/projects/vap/sys/net80211/ieee80211_crypto_tkip.c#9 (text+ko) ====

@@ -33,6 +33,8 @@
  * AP driver. The code is used with the consent of the author and
  * it's license is included below.
  */
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   

==== //depot/projects/vap/sys/net80211/ieee80211_crypto_wep.c#9 (text+ko) ====

@@ -29,6 +29,8 @@
 /*
  * IEEE 802.11 WEP crypto support.
  */
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   

==== //depot/projects/vap/sys/net80211/ieee80211_dfs.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  * IEEE 802.11 DFS/Radar support.
  */
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 

==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#14 (text+ko) ====

@@ -29,6 +29,8 @@
 /*
  * IEEE 802.11 support (FreeBSD-specific code)
  */
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h> 

==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#13 (text+ko) ====

@@ -28,8 +28,6 @@
 #define _NET80211_IEEE80211_FREEBSD_H_
 
 #ifdef _KERNEL
-#include "opt_wlan.h"
-
 /*
  * Common state locking definitions.
  */

==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  * IEEE 802.11 HOSTAP mode support.
  */
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 

==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#5 (text+ko) ====

@@ -33,6 +33,7 @@
  */
 
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/vap/sys/net80211/ieee80211_input.c#23 (text+ko) ====

@@ -27,6 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.114 2007/11/02 05:22:24 sam Exp $");
 
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>   

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#19 (text+ko) ====

@@ -33,6 +33,7 @@
 
 #include "opt_inet.h"
 #include "opt_ipx.h"
+#include "opt_wlan.h"
 
 #include <sys/endian.h>
 #include <sys/param.h>

==== //depot/projects/vap/sys/net80211/ieee80211_monitor.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  * IEEE 802.11 Monitor mode support.
  */
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 

==== //depot/projects/vap/sys/net80211/ieee80211_node.c#17 (text+ko) ====

@@ -27,6 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.91 2007/11/23 06:23:12 sam Exp $");
 
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   

==== //depot/projects/vap/sys/net80211/ieee80211_output.c#20 (text+ko) ====

@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.56 2007/11/23 06:24:57 sam Exp $");
 
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 

==== //depot/projects/vap/sys/net80211/ieee80211_power.c#7 (text+ko) ====

@@ -29,6 +29,8 @@
 /*
  * IEEE 802.11 power save support.
  */
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/kernel.h>

==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#17 (text+ko) ====

@@ -32,6 +32,7 @@
  */
 
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#4 (text+ko) ====

@@ -37,6 +37,7 @@
 /*
  * IEEE 802.11 regdomain support.
  */
+#include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 

==== //depot/projects/vap/sys/net80211/ieee80211_scan.c#12 (text+ko) ====

@@ -29,6 +29,8 @@
 /*
  * IEEE 802.11 scanning support.
  */
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/kernel.h>

==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#14 (text+ko) ====

@@ -29,6 +29,8 @@
 /*
  * IEEE 802.11 station scanning support.
  */
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/kernel.h>

==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  * IEEE 802.11 Station mode support.
  */
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 

==== //depot/projects/vap/sys/net80211/ieee80211_wds.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  * IEEE 802.11 WDS mode support.
  */
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 

==== //depot/projects/vap/sys/net80211/ieee80211_xauth.c#7 (text+ko) ====

@@ -39,6 +39,8 @@
  * of the available callbacks--the user mode authenticator process works
  * entirely from messages about stations joining and leaving.
  */
+#include "opt_wlan.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>