Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / brcm80211 / sys / wl_mac80211.h

diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.h b/drivers/staging/brcm80211/sys/wl_mac80211.h
index 78cee4454b0b4eb4ddae9c0499055be668da7d69..bb39b77059473558dbc02f6efd6edce0fa7a3c78 100644 (file)
--- a/drivers/staging/brcm80211/sys/wl_mac80211.h
+++ b/drivers/staging/brcm80211/sys/wl_mac80211.h
@@ -60,58 +60,32 @@ struct wl_firmware {
 };
 
 struct wl_info {
-       wlc_pub_t *pub;         /* pointer to public wlc state */
+       struct wlc_pub *pub;            /* pointer to public wlc state */
        void *wlc;              /* pointer to private common os-independent data */
-       osl_t *osh;             /* pointer to os handler */
+       struct osl_info *osh;           /* pointer to os handler */
        u32 magic;
 
        int irq;
 
-#ifdef WLC_HIGH_ONLY
-       struct semaphore sem;   /* use semaphore to allow sleep */
-#else
        spinlock_t lock;        /* per-device perimeter lock */
        spinlock_t isr_lock;    /* per-device ISR synchronization lock */
-#endif
        uint bcm_bustype;       /* bus type */
        bool piomode;           /* set from insmod argument */
        void *regsva;           /* opaque chip registers virtual address */
        atomic_t callbacks;     /* # outstanding callback functions */
        struct wl_timer *timers;        /* timer cleanup queue */
        struct tasklet_struct tasklet;  /* dpc tasklet */
-#ifdef BCMSDIO
-       bcmsdh_info_t *sdh;     /* pointer to sdio bus handler */
-       unsigned long flags;            /* current irq flags */
-#endif                         /* BCMSDIO */
        bool resched;           /* dpc needs to be and is rescheduled */
 #ifdef LINUXSTA_PS
        u32 pci_psstate[16];    /* pci ps-state save/restore */
 #endif
        /* RPC, handle, lock, txq, workitem */
-#ifdef WLC_HIGH_ONLY
-       rpc_info_t *rpc;        /* RPC handle */
-       rpc_tp_info_t *rpc_th;  /* RPC transport handle */
-       wlc_rpc_ctx_t rpc_dispatch_ctx;
-
-       bool rpcq_dispatched;   /* Avoid scheduling multiple tasks */
-       spinlock_t rpcq_lock;   /* Lock for the queue */
-       rpc_buf_t *rpcq_head;   /* RPC Q */
-       rpc_buf_t *rpcq_tail;   /* Points to the last buf */
-
-       bool txq_dispatched;    /* Avoid scheduling multiple tasks */
-       spinlock_t txq_lock;    /* Lock for the queue */
-       struct sk_buff *txq_head;       /* TX Q */
-       struct sk_buff *txq_tail;       /* Points to the last buf */
-
-       wl_task_t txq_task;     /* work queue for wl_start() */
-#endif                         /* WLC_HIGH_ONLY */
        uint stats_id;          /* the current set of stats */
        /* ping-pong stats counters updated by Linux watchdog */
        struct net_device_stats stats_watchdog[2];
        struct wl_firmware fw;
 };
 
-#ifndef WLC_HIGH_ONLY
 #define WL_LOCK(wl)    spin_lock_bh(&(wl)->lock)
 #define WL_UNLOCK(wl)  spin_unlock_bh(&(wl)->lock)
 
@@ -122,17 +96,6 @@ struct wl_info {
 /* locking under WL_LOCK() to synchronize with wl_isr */
 #define INT_LOCK(wl, flags)    spin_lock_irqsave(&(wl)->isr_lock, flags)
 #define INT_UNLOCK(wl, flags)  spin_unlock_irqrestore(&(wl)->isr_lock, flags)
-#else                          /* BCMSDIO */
-
-#define WL_LOCK(wl)    down(&(wl)->sem)
-#define WL_UNLOCK(wl)  up(&(wl)->sem)
-
-#define WL_ISRLOCK(wl)
-#define WL_ISRUNLOCK(wl)
-#endif                         /* WLC_HIGH_ONLY */
-
-/* handle forward declaration */
-typedef struct wl_info wl_info_t;
 
 #ifndef PCI_D0
 #define PCI_D0         0
@@ -148,14 +111,7 @@ extern irqreturn_t wl_isr(int irq, void *dev_id);
 
 extern int __devinit wl_pci_probe(struct pci_dev *pdev,
                                  const struct pci_device_id *ent);
-extern void wl_free(wl_info_t *wl);
+extern void wl_free(struct wl_info *wl);
 extern int wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-extern int wl_ucode_data_init(wl_info_t *wl);
-extern void wl_ucode_data_free(void);
-#ifdef WLC_LOW
-extern void wl_ucode_free_buf(void *);
-extern int wl_ucode_init_buf(wl_info_t *wl, void **pbuf, u32 idx);
-extern int wl_ucode_init_uint(wl_info_t *wl, u32 *data, u32 idx);
-#endif                         /* WLC_LOW */
 
 #endif                         /* _wl_mac80211_h_ */