Merge remote-tracking branch 'ipsec/master'

[karo-tx-linux.git] / drivers / net / wireless / mwifiex / usb.h

diff --git a/drivers/net/wireless/mwifiex/usb.h b/drivers/net/wireless/mwifiex/usb.h
index f0051f8c8981eb4d7bd1614999a2db9238a66fd2..b4e9246bbcdc9080d3b9bddec7e0f3aab1d16fa1 100644 (file)
--- a/drivers/net/wireless/mwifiex/usb.h
+++ b/drivers/net/wireless/mwifiex/usb.h
@@ -28,11 +28,9 @@
 #define USB8766_PID_2          0x2042
 #define USB8797_PID_1          0x2043
 #define USB8797_PID_2          0x2044
-#define USB8897_PID_1          0x2045
-#define USB8897_PID_2          0x2046
 #define USB8801_PID_1          0x2049
 #define USB8801_PID_2          0x204a
-#define USB8997_PID_1          0x204d
+#define USB8997_PID_1          0x2052
 #define USB8997_PID_2          0x204e
 
 
@@ -40,6 +38,7 @@
 #define USB8XXX_FW_READY       2
 #define USB8XXX_FW_MAX_RETRY   3
 
+#define MWIFIEX_TX_DATA_PORT   2
 #define MWIFIEX_TX_DATA_URB    6
 #define MWIFIEX_RX_DATA_URB    6
 #define MWIFIEX_USB_TIMEOUT    100
@@ -47,7 +46,6 @@
 #define USB8766_DEFAULT_FW_NAME        "mrvl/usb8766_uapsta.bin"
 #define USB8797_DEFAULT_FW_NAME        "mrvl/usb8797_uapsta.bin"
 #define USB8801_DEFAULT_FW_NAME        "mrvl/usb8801_uapsta.bin"
-#define USB8897_DEFAULT_FW_NAME        "mrvl/usb8897_uapsta.bin"
 #define USB8997_DEFAULT_FW_NAME        "mrvl/usb8997_uapsta.bin"
 
 #define FW_DNLD_TX_BUF_SIZE    620
@@ -64,6 +62,14 @@ struct urb_context {
        u8 ep;
 };
 
+struct usb_tx_data_port {
+       u8 tx_data_ep;
+       u8 block_status;
+       atomic_t tx_data_urb_pending;
+       int tx_data_ix;
+       struct urb_context tx_data_list[MWIFIEX_TX_DATA_URB];
+};
+
 struct usb_card_rec {
        struct mwifiex_adapter *adapter;
        struct usb_device *udev;
@@ -75,14 +81,12 @@ struct usb_card_rec {
        u8 usb_boot_state;
        u8 rx_data_ep;
        atomic_t rx_data_urb_pending;
-       u8 tx_data_ep;
        u8 tx_cmd_ep;
-       atomic_t tx_data_urb_pending;
        atomic_t tx_cmd_urb_pending;
        int bulk_out_maxpktsize;
        struct urb_context tx_cmd;
-       int tx_data_ix;
-       struct urb_context tx_data_list[MWIFIEX_TX_DATA_URB];
+       u8 mc_resync_flag;
+       struct usb_tx_data_port port[MWIFIEX_TX_DATA_PORT];
 };
 
 struct fw_header {