[PATCH] libertas: fix RESET logic at unload time

[pandora-kernel.git] / 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 7851167..bfad79e 100644 (file)
--- a/drivers/net/wireless/libertas/if_usb.h
+++ b/drivers/net/wireless/libertas/if_usb.h
@@ -1,3 +1,8 @@
+#ifndef _LIBERTAS_IF_USB_H
+#define _LIBERTAS_IF_USB_H
+
+#include <linux/list.h>
+
 /**
   * This file contains definition for USB interface.
   */
@@ -7,12 +12,6 @@
 
 #define IPFIELD_ALIGN_OFFSET   2
 
-#define USB8388_VID_1  0x1286
-#define USB8388_PID_1  0x2001
-#define USB8388_VID_2  0x05a3
-#define USB8388_PID_2  0x8388
-
-#ifdef SUPPORT_BOOT_COMMAND
 #define BOOT_CMD_FW_BY_USB     0x01
 #define BOOT_CMD_FW_IN_EEPROM  0x02
 #define BOOT_CMD_UPDATE_BOOT2  0x03
@@ -36,7 +35,6 @@ struct bootcmdrespStr
        u8  u8result;
        u8  au8dumy[2];
 };
-#endif /* SUPPORT_BOOT_COMMAND */
 
 /* read callback private data */
 struct read_cb_info {
@@ -46,6 +44,7 @@ struct read_cb_info {
 
 /** USB card description structure*/
 struct usb_card_rec {
+       struct list_head list;
        struct net_device *eth_dev;
        struct usb_device *udev;
        struct urb *rx_urb, *tx_urb;
@@ -107,3 +106,4 @@ int usb_tx_block(wlan_private *priv, u8 *payload, u16 nb);
 void if_usb_free(struct usb_card_rec *cardp);
 int if_usb_issue_boot_command(wlan_private *priv, int ivalue);
 
+#endif