From 1646bf242ac6327bad7a340e583ae0447a00900d Mon Sep 17 00:00:00 2001
From: Colin McCabe <colin@cozybit.com>
Date: Fri, 2 Jan 2009 19:00:22 -0800
Subject: [PATCH] --- yaml --- r: 134123 b: refs/heads/master c:
 b48365994b1b5cce8078c0707a06cf9897007fb5 h: refs/heads/master i:   134121:
 13b4ff809b4d35c787226b2b74b2e2792d83dc3e   134119:
 d40e0c6e944f76f204ac246d73072b1627484f69 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/libertas/host.h    | 1 +
 trunk/drivers/net/wireless/libertas/hostcmd.h | 8 ++++++++
 trunk/drivers/net/wireless/libertas/main.c    | 5 ++---
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0664a8c1c0aa..cb06e6037de8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7a7c8ecd43b4bc796a8e79c46305e2a677b55f3
+refs/heads/master: b48365994b1b5cce8078c0707a06cf9897007fb5
diff --git a/trunk/drivers/net/wireless/libertas/host.h b/trunk/drivers/net/wireless/libertas/host.h
index 277ff1975bde..d4457ef808a6 100644
--- a/trunk/drivers/net/wireless/libertas/host.h
+++ b/trunk/drivers/net/wireless/libertas/host.h
@@ -66,6 +66,7 @@
 #define CMD_802_11_LED_GPIO_CTRL		0x004e
 #define CMD_802_11_EEPROM_ACCESS		0x0059
 #define CMD_802_11_BAND_CONFIG			0x0058
+#define CMD_GSPI_BUS_CONFIG			0x005a
 #define CMD_802_11D_DOMAIN_INFO			0x005b
 #define CMD_802_11_KEY_MATERIAL			0x005e
 #define CMD_802_11_SLEEP_PARAMS			0x0066
diff --git a/trunk/drivers/net/wireless/libertas/hostcmd.h b/trunk/drivers/net/wireless/libertas/hostcmd.h
index f6a79a653b7b..a899aeb676bb 100644
--- a/trunk/drivers/net/wireless/libertas/hostcmd.h
+++ b/trunk/drivers/net/wireless/libertas/hostcmd.h
@@ -221,6 +221,14 @@ struct cmd_ds_mac_multicast_adr {
 	u8 maclist[ETH_ALEN * MRVDRV_MAX_MULTICAST_LIST_SIZE];
 } __attribute__ ((packed));
 
+struct cmd_ds_gspi_bus_config {
+	struct cmd_header hdr;
+	__le16 action;
+	__le16 bus_delay_mode;
+	__le16 host_time_delay_to_read_port;
+	__le16 host_time_delay_to_read_register;
+} __attribute__ ((packed));
+
 struct cmd_ds_802_11_authenticate {
 	u8 macaddr[ETH_ALEN];
 	u8 authtype;
diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c
index 4e0007d20030..8a7eb2778eb6 100644
--- a/trunk/drivers/net/wireless/libertas/main.c
+++ b/trunk/drivers/net/wireless/libertas/main.c
@@ -1006,9 +1006,8 @@ void lbs_resume(struct lbs_private *priv)
 EXPORT_SYMBOL_GPL(lbs_resume);
 
 /**
- *  @brief This function downloads firmware image, gets
- *  HW spec from firmware and set basic parameters to
- *  firmware.
+ * @brief This function gets the HW spec from the firmware and sets
+ *        some basic parameters.
  *
  *  @param priv    A pointer to struct lbs_private structure
  *  @return 	   0 or -1