diff options
author | Colin McCabe <colin@cozybit.com> | 2009-01-02 22:00:22 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 16:00:16 -0500 |
commit | b48365994b1b5cce8078c0707a06cf9897007fb5 (patch) | |
tree | 31aa27ad313684961568ab836eb3839a248f3e87 /drivers/net/wireless | |
parent | c7a7c8ecd43b4bc796a8e79c46305e2a677b55f3 (diff) |
libertas: Update libertas core with GSPI constants
Add GSPI constants to libertas core.
Fix misleading comment in lbs_setup_firmware.
Signed-off-by: Colin McCabe <colin@cozybit.com>
Signed-off-by: Andrey Yurovsky <andrey@cozybit.com>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/libertas/host.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/hostcmd.h | 8 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h index 277ff1975bde..d4457ef808a6 100644 --- a/drivers/net/wireless/libertas/host.h +++ b/drivers/net/wireless/libertas/host.h | |||
@@ -66,6 +66,7 @@ | |||
66 | #define CMD_802_11_LED_GPIO_CTRL 0x004e | 66 | #define CMD_802_11_LED_GPIO_CTRL 0x004e |
67 | #define CMD_802_11_EEPROM_ACCESS 0x0059 | 67 | #define CMD_802_11_EEPROM_ACCESS 0x0059 |
68 | #define CMD_802_11_BAND_CONFIG 0x0058 | 68 | #define CMD_802_11_BAND_CONFIG 0x0058 |
69 | #define CMD_GSPI_BUS_CONFIG 0x005a | ||
69 | #define CMD_802_11D_DOMAIN_INFO 0x005b | 70 | #define CMD_802_11D_DOMAIN_INFO 0x005b |
70 | #define CMD_802_11_KEY_MATERIAL 0x005e | 71 | #define CMD_802_11_KEY_MATERIAL 0x005e |
71 | #define CMD_802_11_SLEEP_PARAMS 0x0066 | 72 | #define CMD_802_11_SLEEP_PARAMS 0x0066 |
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h index f6a79a653b7b..a899aeb676bb 100644 --- a/drivers/net/wireless/libertas/hostcmd.h +++ b/drivers/net/wireless/libertas/hostcmd.h | |||
@@ -221,6 +221,14 @@ struct cmd_ds_mac_multicast_adr { | |||
221 | u8 maclist[ETH_ALEN * MRVDRV_MAX_MULTICAST_LIST_SIZE]; | 221 | u8 maclist[ETH_ALEN * MRVDRV_MAX_MULTICAST_LIST_SIZE]; |
222 | } __attribute__ ((packed)); | 222 | } __attribute__ ((packed)); |
223 | 223 | ||
224 | struct cmd_ds_gspi_bus_config { | ||
225 | struct cmd_header hdr; | ||
226 | __le16 action; | ||
227 | __le16 bus_delay_mode; | ||
228 | __le16 host_time_delay_to_read_port; | ||
229 | __le16 host_time_delay_to_read_register; | ||
230 | } __attribute__ ((packed)); | ||
231 | |||
224 | struct cmd_ds_802_11_authenticate { | 232 | struct cmd_ds_802_11_authenticate { |
225 | u8 macaddr[ETH_ALEN]; | 233 | u8 macaddr[ETH_ALEN]; |
226 | u8 authtype; | 234 | u8 authtype; |
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 4e0007d20030..8a7eb2778eb6 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
@@ -1006,9 +1006,8 @@ void lbs_resume(struct lbs_private *priv) | |||
1006 | EXPORT_SYMBOL_GPL(lbs_resume); | 1006 | EXPORT_SYMBOL_GPL(lbs_resume); |
1007 | 1007 | ||
1008 | /** | 1008 | /** |
1009 | * @brief This function downloads firmware image, gets | 1009 | * @brief This function gets the HW spec from the firmware and sets |
1010 | * HW spec from firmware and set basic parameters to | 1010 | * some basic parameters. |
1011 | * firmware. | ||
1012 | * | 1011 | * |
1013 | * @param priv A pointer to struct lbs_private structure | 1012 | * @param priv A pointer to struct lbs_private structure |
1014 | * @return 0 or -1 | 1013 | * @return 0 or -1 |