iwlwifi: rename 4965 to AGN

[linux-2.6] / drivers / net / wireless / libertas / dev.h

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 1e6bae80396b1262c15020d4b11a31d949285e9f..f5bb40c54d85128d4e3eae2f042e7291d763600b 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -129,10 +129,6 @@ struct lbs_private {
        u32 bbp_offset;
        u32 rf_offset;
 
-       /** Upload length */
-       u32 upld_len;
-       /* Upload buffer */
-       u8 upld_buf[LBS_UPLD_SIZE];
        /* Download sent:
           bit0 1/0=data_sent/data_tx_done,
           bit1 1/0=cmd_sent/cmd_tx_done,
@@ -144,6 +140,8 @@ struct lbs_private {
        wait_queue_head_t waitq;
        struct workqueue_struct *work_thread;
 
+       struct work_struct mcast_work;
+
        /** Scanning */
        struct delayed_work scan_work;
        struct delayed_work assoc_work;
@@ -155,21 +153,17 @@ struct lbs_private {
 
        /** Hardware access */
        int (*hw_host_to_card) (struct lbs_private *priv, u8 type, u8 *payload, u16 nb);
-       int (*hw_get_int_status) (struct lbs_private *priv, u8 *);
-       int (*hw_read_event_cause) (struct lbs_private *);
+       void (*reset_card) (struct lbs_private *priv);
 
        /* Wake On LAN */
        uint32_t wol_criteria;
        uint8_t wol_gpio;
        uint8_t wol_gap;
 
-       /* was struct lbs_adapter from here... */
-
        /** Wlan adapter data structure*/
        /** STATUS variables */
        u32 fwrelease;
        u32 fwcapinfo;
-       /* protected with big lock */
 
        struct mutex lock;
 
@@ -181,7 +175,6 @@ struct lbs_private {
 
        /** command-related variables */
        u16 seqnum;
-       /* protected by big lock */
 
        struct cmd_ctrl_node *cmd_array;
        /** Current command */
@@ -194,12 +187,17 @@ struct lbs_private {
        struct list_head cmdpendingq;
 
        wait_queue_head_t cmd_pending;
-       /* command related variables protected by priv->driver_lock */
 
-       /** Async and Sync Event variables */
-       u32 intcounter;
-       u32 eventcause;
-       u8 nodename[16];        /* nickname */
+       /* Command responses sent from the hardware to the driver */
+       u8 resp_idx;
+       u8 resp_buf[2][LBS_UPLD_SIZE];
+       u32 resp_len[2];
+
+       /* Events sent from hardware to driver */
+       struct kfifo *event_fifo;
+
+       /* nickname */
+       u8 nodename[16];
 
        /** spin locks */
        spinlock_t driver_lock;
@@ -209,8 +207,6 @@ struct lbs_private {
        int nr_retries;
        int cmd_timed_out;
 
-       u8 hisregcpy;
-
        /** current ssid/bssid related parameters*/
        struct current_bss_params curbssparams;
 
@@ -241,8 +237,8 @@ struct lbs_private {
        /** 802.11 statistics */
 //     struct cmd_DS_802_11_GET_STAT wlan802_11Stat;
 
-       u16 enablehwauto;
-       u16 ratebitmap;
+       uint16_t enablehwauto;
+       uint16_t ratebitmap;
 
        u32 fragthsd;
        u32 rtsthsd;
@@ -300,7 +296,6 @@ struct lbs_private {
 
        /** data rate stuff */
        u8 cur_rate;
-       u8 auto_rate;
 
        /** RF calibration data */