wireless.h include fixups.

CHANGES

@@ -41,6 +41,7 @@
 * Intersil Corporation as part of PRISM(R) chipset product development.
 *
 * --------------------------------------------------------------------
+  - Add a test to make sure wireless.h is included.
   - Netgear MA401A card ident.
   - Further cleanups of the build system (Makefiles)
 -pre7

src/include/wlan/p80211netdev.h

@@ -53,12 +53,6 @@
 #ifndef _LINUX_P80211NETDEV_H
 #define _LINUX_P80211NETDEV_H
 
-#include <linux/wireless.h>
-#include <linux/netdevice.h>
-#include <wlan/p80211hdr.h>
-#include <wlan/p80211msg.h>
-#include <wlan/p80211conv.h>
-
 /*================================================================*/
 /* Constants */
 
@@ -213,6 +207,10 @@ typedef struct wlandevice
 	struct p80211_frmrx_t	rx;
 
 /* compatibility to wireless extensions */
+#ifndef WIRELESS_EXT
+#error "you forgot to include linux/wireless.h"
+#endif
+
 #if WIRELESS_EXT > 10
 	struct  iw_statistics* (*get_wireless_stats)(struct net_device *dev);
 	struct  iw_statistics wstats; /* Wireless-specific statistics */

src/p80211/p80211conv.c

@@ -65,6 +65,7 @@
 #include <linux/types.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
+#include <linux/wireless.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <asm/byteorder.h>

src/p80211/p80211mod.c

@@ -63,6 +63,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/types.h>
+#include <linux/wireless.h>
 #include <linux/netdevice.h>
 
 #include <wlan/wlan_compat.h>

src/p80211/p80211netdev.c

@@ -67,6 +67,7 @@
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/rtnetlink.h>
+#include <linux/wireless.h>
 #include <linux/etherdevice.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>

src/p80211/p80211req.c

@@ -64,6 +64,7 @@
 #include <linux/types.h>
 #include <linux/skbuff.h>
 #include <linux/slab.h>
+#include <linux/wireless.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <net/sock.h>

src/p80211/p80211wep.c

@@ -51,6 +51,8 @@
 #include <linux/config.h>
 #include <linux/version.h>
 
+#include <linux/netdevice.h>
+#include <linux/wireless.h>
 #include <linux/slab.h>
 #include <linux/random.h>
 
@@ -62,6 +64,9 @@
 /* Project Includes */
 
 #include <wlan/version.h>
+#include <wlan/p80211hdr.h>
+#include <wlan/p80211msg.h>
+#include <wlan/p80211conv.h>
 #include <wlan/p80211netdev.h>
 
 /*================================================================*/

src/p80211/p80211wext.c

@@ -43,8 +43,8 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/slab.h>
+#include <linux/wireless.h>
 #include <linux/netdevice.h>
-#include <linux/rtnetlink.h>
 #include <linux/etherdevice.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>

src/prism2/driver/hfa384x.c

@@ -127,6 +127,7 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/slab.h>
+#include <linux/wireless.h>
 #include <linux/netdevice.h>
 #include <linux/timer.h>
 #include <asm/semaphore.h>

src/prism2/driver/hfa384x_usb.c

@@ -123,6 +123,7 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/slab.h>
+#include <linux/wireless.h>
 #include <linux/netdevice.h>
 #include <linux/timer.h>
 #include <asm/semaphore.h>

src/prism2/driver/prism2mgmt.c

@@ -73,6 +73,7 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/slab.h>
+#include <linux/wireless.h>
 #include <linux/netdevice.h>
 #include <asm/io.h>
 #include <linux/delay.h>

src/prism2/driver/prism2mib.c

@@ -64,6 +64,7 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/slab.h>
+#include <linux/wireless.h>
 #include <linux/netdevice.h>
 #include <asm/io.h>
 #include <linux/delay.h>

src/prism2/driver/prism2sta.c

@@ -62,6 +62,7 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/slab.h>
+#include <linux/wireless.h>
 #include <linux/netdevice.h>
 #include <asm/io.h>
 #include <linux/delay.h>