Commit b4836599 authored by Colin McCabe's avatar Colin McCabe Committed by John W. Linville

libertas: Update libertas core with GSPI constants

Add GSPI constants to libertas core.

Fix misleading comment in lbs_setup_firmware.
Signed-off-by: default avatarColin McCabe <colin@cozybit.com>
Signed-off-by: default avatarAndrey Yurovsky <andrey@cozybit.com>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c7a7c8ec
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
#define CMD_802_11_LED_GPIO_CTRL 0x004e #define CMD_802_11_LED_GPIO_CTRL 0x004e
#define CMD_802_11_EEPROM_ACCESS 0x0059 #define CMD_802_11_EEPROM_ACCESS 0x0059
#define CMD_802_11_BAND_CONFIG 0x0058 #define CMD_802_11_BAND_CONFIG 0x0058
#define CMD_GSPI_BUS_CONFIG 0x005a
#define CMD_802_11D_DOMAIN_INFO 0x005b #define CMD_802_11D_DOMAIN_INFO 0x005b
#define CMD_802_11_KEY_MATERIAL 0x005e #define CMD_802_11_KEY_MATERIAL 0x005e
#define CMD_802_11_SLEEP_PARAMS 0x0066 #define CMD_802_11_SLEEP_PARAMS 0x0066
......
...@@ -221,6 +221,14 @@ struct cmd_ds_mac_multicast_adr { ...@@ -221,6 +221,14 @@ struct cmd_ds_mac_multicast_adr {
u8 maclist[ETH_ALEN * MRVDRV_MAX_MULTICAST_LIST_SIZE]; u8 maclist[ETH_ALEN * MRVDRV_MAX_MULTICAST_LIST_SIZE];
} __attribute__ ((packed)); } __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 { struct cmd_ds_802_11_authenticate {
u8 macaddr[ETH_ALEN]; u8 macaddr[ETH_ALEN];
u8 authtype; u8 authtype;
......
...@@ -1006,9 +1006,8 @@ void lbs_resume(struct lbs_private *priv) ...@@ -1006,9 +1006,8 @@ void lbs_resume(struct lbs_private *priv)
EXPORT_SYMBOL_GPL(lbs_resume); EXPORT_SYMBOL_GPL(lbs_resume);
/** /**
* @brief This function downloads firmware image, gets * @brief This function gets the HW spec from the firmware and sets
* HW spec from firmware and set basic parameters to * some basic parameters.
* firmware.
* *
* @param priv A pointer to struct lbs_private structure * @param priv A pointer to struct lbs_private structure
* @return 0 or -1 * @return 0 or -1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment