libertas: convert sleep/wake config direct commands

[safe/jmp/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 fd1fcc7..3f3e7f6 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -149,6 +149,8 @@ struct lbs_private {
        struct work_struct sync_channel;
        /* remember which channel was scanned last, != 0 if currently scanning */
        int scan_channel;
+       u8 scan_ssid[IW_ESSID_MAX_SIZE + 1];
+       u8 scan_ssid_len;
 
        /** Hardware access */
        int (*hw_host_to_card) (struct lbs_private *priv, u8 type, u8 *payload, u16 nb);
@@ -250,7 +252,7 @@ struct lbs_private {
        struct sk_buff *currenttxskb;
 
        /** NIC Operation characteristics */
-       u16 currentpacketfilter;
+       u16 mac_control;
        u32 connect_status;
        u32 mesh_connect_status;
        u16 regioncode;
@@ -265,9 +267,6 @@ struct lbs_private {
        char ps_supported;
        u8 needtowakeup;
 
-       struct PS_CMD_ConfirmSleep lbs_ps_confirm_sleep;
-       struct cmd_header lbs_ps_confirm_wake;
-
        struct assoc_request * pending_assoc_req;
        struct assoc_request * in_progress_assoc_req;
 
@@ -318,15 +317,14 @@ struct lbs_private {
        u32 enable11d;
 
        /**     MISCELLANEOUS */
-       u8 *prdeeprom;
        struct lbs_offset_value offsetvalue;
 
-       struct cmd_ds_802_11_get_log logmsg;
-
        u32 monitormode;
        u8 fw_ready;
 };
 
+extern struct cmd_confirm_sleep confirm_sleep;
+
 /** Association request
  *
  * Encapsulates all the options that describe a specific assocation request