vserver 1.9.5.x5

[linux-2.6.git] / drivers / net / wireless / prism54 / islpci_dev.h

diff --git a/drivers/net/wireless/prism54/islpci_dev.h b/drivers/net/wireless/prism54/islpci_dev.h
index de92b4e..d71b8bb 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_dev.h
+++ b/drivers/net/wireless/prism54/islpci_dev.h
@@ -29,20 +29,6 @@
 #include <net/iw_handler.h>
 #include <linux/list.h>
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,41)
-# include <linux/workqueue.h>
-#else
-# include <linux/tqueue.h>
-# define work_struct tq_struct
-# define INIT_WORK INIT_TQUEUE
-# define schedule_work schedule_task
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
-#define free_netdev(x) kfree(x) 
-#define pci_name(x) x->slot_name 
-#endif
-
 #include "isl_38xx.h"
 #include "isl_oid.h"
 #include "islpci_mgt.h"
@@ -114,16 +100,19 @@ typedef struct {
 
        struct iw_spy_data spy_data; /* iwspy support */
 
+#if WIRELESS_EXT > 16
+       struct iw_public_data wireless_data;
+#endif /* WIRELESS_EXT > 16 */
+
        int monitor_type; /* ARPHRD_IEEE80211 or ARPHRD_IEEE80211_PRISM */
 
        struct islpci_acl acl;
 
        /* PCI bus allocation & configuration members */
        struct pci_dev *pdev;   /* PCI structure information */
-       u32 pci_state[16];      /* used for suspend/resume */
        char firmware[33];
 
-       void *device_base;      /* ioremapped device base address */
+       void __iomem *device_base;      /* ioremapped device base address */
 
        /* consistent DMA region */
        void *driver_mem_address;       /* base DMA address */
@@ -187,7 +176,7 @@ typedef struct {
        islpci_state_t state;
        int state_off;          /* enumeration of off-state, if 0 then
                                 * we're not in any off-state */
-       
+
        /* WPA stuff */
        int wpa; /* WPA mode enabled */
        struct list_head bss_wpa_list;
@@ -210,12 +199,6 @@ islpci_state_t islpci_set_state(islpci_private *priv, islpci_state_t new_state);
 
 #define ISLPCI_TX_TIMEOUT               (2*HZ)
 
-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,75))
-# define irqreturn_t void
-# define IRQ_HANDLED
-# define IRQ_NONE
-#endif
-
 irqreturn_t islpci_interrupt(int, void *, struct pt_regs *);
 
 int prism54_post_setup(islpci_private *, int);
@@ -230,8 +213,6 @@ islpci_trigger(islpci_private *priv)
 
 struct net_device_stats *islpci_statistics(struct net_device *);
 
-int prism54_bring_down(islpci_private *);
-int islpci_alloc_memory(islpci_private *);
 int islpci_free_memory(islpci_private *);
 struct net_device *islpci_setup(struct pci_dev *);
 #endif                         /* _ISLPCI_DEV_H */