Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[safe/jmp/linux-2.6] / drivers / net / wireless / libertas / if_usb.h

diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/libertas/if_usb.h
index 7706691..5ba0aee 100644 (file)
--- a/drivers/net/wireless/libertas/if_usb.h
+++ b/drivers/net/wireless/libertas/if_usb.h
@@ -30,6 +30,7 @@ struct bootcmd
 
 #define BOOT_CMD_RESP_OK               0x0001
 #define BOOT_CMD_RESP_FAIL             0x0000
+#define BOOT_CMD_RESP_NOT_SUPPORTED    0x0002
 
 struct bootcmdresp
 {
@@ -46,12 +47,14 @@ struct if_usb_card {
        struct lbs_private *priv;
 
        struct sk_buff *rx_skb;
-       uint32_t usb_event_cause;
-       uint8_t usb_int_cause;
 
        uint8_t ep_in;
        uint8_t ep_out;
 
+       /* bootcmdresp == 0 means command is pending
+        * bootcmdresp < 0 means error
+        * bootcmdresp > 0 is a BOOT_CMD_RESP_* from firmware
+        */
        int8_t bootcmdresp;
 
        int ep_in_size;
@@ -70,6 +73,7 @@ struct if_usb_card {
        uint8_t fwfinalblk;
        uint8_t surprise_removed;
 
+       __le16 boot2_version;
 };
 
 /** fwheader */