From 9024a4d5d935acaebad0d9016cd2d177bc040772 Mon Sep 17 00:00:00 2001
From: solomon <solomon>
Date: Fri, 23 Aug 2002 15:01:11 +0000
Subject: [PATCH] @#^@# header file hell.

modversion stuff now done.
---
 CHANGES                                |  1 +
 src/prism2/driver/prism2mgmt.c         | 16 +++----
 src/prism2/driver/prism2wext.c         | 52 ++++++++++++++++++++++-
 src/prism2/include/prism2/prism2wext.h | 59 --------------------------
 4 files changed, 57 insertions(+), 71 deletions(-)

diff --git a/CHANGES b/CHANGES
index aa2b590..a467bb2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,6 +41,7 @@
 * Intersil Corporation as part of PRISM(R) chipset product development.
 *
 * --------------------------------------------------------------------
+  - Rearranged the wireless extension support code a bit.
   - A fix for the promisc/allmulti stuff on USB devices
 -pre4
   - Hotplug support for PCI/PLX/USB widgets
diff --git a/src/prism2/driver/prism2mgmt.c b/src/prism2/driver/prism2mgmt.c
index e9b7744..5286858 100644
--- a/src/prism2/driver/prism2mgmt.c
+++ b/src/prism2/driver/prism2mgmt.c
@@ -62,8 +62,9 @@
 
 #define __NO_VERSION__
 
-#include <linux/config.h>
 #define WLAN_DBVAR	prism2_debug
+
+#include <linux/config.h>
 #include <linux/version.h>
 #include <wlan/modver_wrapper.h>
 
@@ -78,7 +79,9 @@
 #include <linux/delay.h>
 #include <asm/byteorder.h>
 
-#include <wlan/wlan_compat.h>
+#if (WLAN_HOSTIF == WLAN_USB)
+#include <linux/usb.h>
+#endif
 
 #if (WLAN_HOSTIF == WLAN_PCMCIA)
 #include <pcmcia/version.h>
@@ -90,14 +93,7 @@
 #include <pcmcia/driver_ops.h>
 #endif
 
-#if ((WLAN_HOSTIF == WLAN_PLX) || (WLAN_HOSTIF == WLAN_PCI))
-#include <linux/ioport.h>
-#include <linux/pci.h>
-#endif
-
-#if (WLAN_HOSTIF == WLAN_USB)
-#include <linux/usb.h>
-#endif
+#include <wlan/wlan_compat.h>
 
 /*================================================================*/
 /* Project Includes */
diff --git a/src/prism2/driver/prism2wext.c b/src/prism2/driver/prism2wext.c
index 84ab287..b3b0c4b 100644
--- a/src/prism2/driver/prism2wext.c
+++ b/src/prism2/driver/prism2wext.c
@@ -32,12 +32,60 @@
 /*================================================================*/
 /* System Includes */
 
-#define __NO_VERSION__
-#define WAVEHAN 23
 #define WLAN_DBVAR prism2_debug
 
+#include <linux/config.h>
+#include <linux/version.h>
+#include <wlan/modver_wrapper.h>
+
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/string.h>
+#include <linux/delay.h>
+#include <linux/wireless.h>
+#include <asm/byteorder.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+
+#if (WLAN_HOSTIF == WLAN_USB)
+#include <linux/usb.h>
+#endif
+
+#if (WLAN_HOSTIF == WLAN_PCMCIA)
+#include <pcmcia/version.h>
+#include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/ds.h>
+#include <pcmcia/cisreg.h>
+#include <pcmcia/driver_ops.h>
+#endif
+
+#include <wlan/wlan_compat.h>
+
+/*================================================================*/
+/* Project Includes */
+
+#include <wlan/version.h>
+#include <wlan/p80211types.h>
+#include <wlan/p80211hdr.h>
+#include <wlan/p80211mgmt.h>
+#include <wlan/p80211conv.h>
+#include <wlan/p80211msg.h>
+#include <wlan/p80211netdev.h>
+#include <wlan/p80211req.h>
+#include <wlan/p80211metadef.h>
+#include <wlan/p80211metastruct.h>
+#include <prism2/hfa384x.h>
+#include <prism2/prism2mgmt.h>
 #include <prism2/prism2wext.h>
 
+
+
 /* compatibility to wireless extensions */
 #if WIRELESS_EXT > 10
 
diff --git a/src/prism2/include/prism2/prism2wext.h b/src/prism2/include/prism2/prism2wext.h
index 46d8013..5ae2059 100644
--- a/src/prism2/include/prism2/prism2wext.h
+++ b/src/prism2/include/prism2/prism2wext.h
@@ -35,63 +35,6 @@
 #ifndef _PRISM2_WEXT_H
 #define _PRISM2_WEXT_H
 
-#define WAVEHAN 23
-#define WLAN_DBVAR prism2_debug
-
-#include <linux/config.h>
-#include <linux/version.h>
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
-#include <linux/string.h>
-#include <linux/delay.h>
-#include <asm/byteorder.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-
-#include <wlan/wlan_compat.h>
-
-#if (WLAN_HOSTIF == WLAN_PCMCIA)
-#include <pcmcia/version.h>
-#include <pcmcia/cs_types.h>
-#include <pcmcia/cs.h>
-#include <pcmcia/cistpl.h>
-#include <pcmcia/ds.h>
-#include <pcmcia/cisreg.h>
-#include <pcmcia/driver_ops.h>
-
-#elif ((WLAN_HOSTIF == WLAN_PLX) || (WLAN_HOSTIF == WLAN_PCI))
-#include <linux/pci.h>
-#elif (WLAN_HOSTIF == WLAN_USB)
-#include <linux/usb.h>
-#endif
-
-/*================================================================*/
-/* Project Includes */
-
-#include <wlan/version.h>
-#include <wlan/p80211types.h>
-#include <wlan/p80211hdr.h>
-#include <wlan/p80211mgmt.h>
-#include <wlan/p80211conv.h>
-#include <wlan/p80211msg.h>
-#include <wlan/p80211netdev.h>
-#include <wlan/p80211req.h>
-#include <wlan/p80211metadef.h>
-#include <wlan/p80211metastruct.h>
-#include <prism2/hfa384x.h>
-#include <prism2/prism2mgmt.h>
-
-/* compatibility to wireless extensions */
-#if defined(__LINUX_WLAN__) && defined (__KERNEL__)
-#include <linux/wireless.h>
-#if WIRELESS_EXT > 10
-
 /** function prototypes =============== */
 /* called by /proc/net/wireless */
 iw_stats* prism2wext_get_wireless_stats(struct net_device *dev);
@@ -103,8 +46,6 @@ int prism2wext_get_string(hfa384x_t *hw, struct iw_point *erq, UINT16 rid, UINT1
 /* determine a channel */
 int prism2wext_get_channel(struct iw_freq *iwf);
 /* ... */
-#endif
-#endif
 
 #endif /* _PRISM2_WEXT_H */