[PATCH] hostap: Remove extra defines

[mv-sheeva.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 6f5bea8a5c23d9f4fba3c1a4128085d77e960244..cc061e1560d39c7150f4770f063f89207f752f14 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -18,13 +18,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 {
@@ -787,10 +780,6 @@ struct local_info {
 
        struct prism2_helper_functions *func;
 
-       int bus_master_threshold_tx;
-       int bus_master_threshold_rx;
-       u8 *bus_m1_buf;
-
        u8 *pda;
        int fw_ap;
 #define PRISM2_FW_VER(major, minor, variant) \
@@ -880,35 +869,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;
-#ifdef PRISM2_BUS_MASTER
-       /* bus master for BAP0 (TX) */
-       int bus_m0_tx_idx;
-       u8 *bus_m0_buf;
-
-       /* bus master for BAP1 (RX) */
-       struct sk_buff *rx_skb;
-#endif /* PRISM2_BUS_MASTER */
-#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;
 };