Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / hostap / hostap_wlan.h

diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index 56416b43e4149170390d85ed1d315c300b821748..87a54aa6f4dd2a1e2c1bd6cdbf393cb9f7aa4411 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -1,6 +1,10 @@
 #ifndef HOSTAP_WLAN_H
 #define HOSTAP_WLAN_H
 
+#include <linux/wireless.h>
+#include <linux/netdevice.h>
+#include <net/iw_handler.h>
+
 #include "hostap_config.h"
 #include "hostap_common.h"
 
@@ -18,13 +22,6 @@
  * prism2_send_mgmt() sends these with dev_queue_xmit() to prism2_tx(). */
 #define ETH_P_HOSTAP ETH_P_CONTROL
 
-#ifndef ARPHRD_IEEE80211
-#define ARPHRD_IEEE80211 801
-#endif
-#ifndef ARPHRD_IEEE80211_PRISM
-#define ARPHRD_IEEE80211_PRISM 802
-#endif
-
 /* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
  * (from linux-wlan-ng) */
 struct linux_wlan_ng_val {
@@ -559,8 +556,6 @@ struct prism2_helper_functions {
         * (hostap_{cs,plx,pci}.c */
        int (*card_present)(local_info_t *local);
        void (*cor_sreset)(local_info_t *local);
-       int (*dev_open)(local_info_t *local);
-       int (*dev_close)(local_info_t *local);
        void (*genesis_reset)(local_info_t *local, int hcr);
 
        /* the following functions are from hostap_hw.c, but they may have some
@@ -876,27 +871,8 @@ struct local_info {
        int io_debug_enabled;
 #endif /* PRISM2_IO_DEBUG */
 
-       /* struct local_info is used also in hostap.o that does not define
-        * any PRISM2_{PCCARD,PLX,PCI}. Make sure that the hardware version
-        * specific fields are in the end of the struct (these could also be
-        * moved to void *priv or something like that). */
-#ifdef PRISM2_PCCARD
-       dev_node_t node;
-       dev_link_t *link;
-       int sandisk_connectplus;
-#endif /* PRISM2_PCCARD */
-
-#ifdef PRISM2_PLX
-       void __iomem *attr_mem;
-       unsigned int cor_offset;
-#endif /* PRISM2_PLX */
-
-#ifdef PRISM2_PCI
-       void __iomem *mem_start;
-#endif /* PRISM2_PCI */
-
-       /* NOTE! Do not add common entries here after hardware version
-        * specific blocks. */
+       /* Pointer to hardware model specific (cs,pci,plx) private data. */
+       void *hw_priv;
 };