diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-12-11 18:33:30 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 00:06:41 +0100 |
| commit | 7ad994dec7d36c319cb35cbf3a920d3bda96e6b0 (patch) | |
| tree | b186f3896514d34a86438b61bf3770fde0e4d960 /drivers/net/wireless/libertas/hostcmd.h | |
| parent | libertas: don't run thread while firmware not yet ready (diff) | |
| download | linux-7ad994dec7d36c319cb35cbf3a920d3bda96e6b0.tar.xz linux-7ad994dec7d36c319cb35cbf3a920d3bda96e6b0.zip | |
libertas: clean up direct command handling
Move direct command handling through __lbs_cmd() over to using the
header as the first member of the command structure, and only define
the __lbs_cmd() callback in one place rather than 3. Convert boot2
version command to new usage.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/hostcmd.h')
| -rw-r--r-- | drivers/net/wireless/libertas/hostcmd.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h index ed502b74fa3c..93ac46a05c54 100644 --- a/drivers/net/wireless/libertas/hostcmd.h +++ b/drivers/net/wireless/libertas/hostcmd.h @@ -65,13 +65,20 @@ struct rxpd { u8 reserved[3]; }; +struct cmd_header { + __le16 command; + __le16 size; + __le16 seqnum; + __le16 result; +} __attribute__ ((packed)); + struct cmd_ctrl_node { struct list_head list; /* wait for finish or not */ u16 wait_option; /* command response */ void *pdata_buf; - int (*callback)(struct lbs_private *priv, unsigned long arg, struct cmd_ds_command *resp); + int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *); unsigned long callback_arg; /* command data */ u8 *bufvirtualaddr; @@ -424,6 +431,8 @@ struct cmd_ds_802_11_monitor_mode { }; struct cmd_ds_set_boot2_ver { + struct cmd_header hdr; + __le16 action; __le16 version; }; @@ -678,7 +687,6 @@ struct cmd_ds_command { struct cmd_ds_bt_access bt; struct cmd_ds_fwt_access fwt; struct cmd_ds_mesh_access mesh; - struct cmd_ds_set_boot2_ver boot2_ver; struct cmd_ds_get_tsf gettsf; struct cmd_ds_802_11_subscribe_event subscribe_event; struct cmd_ds_802_11_beacon_control bcn_ctrl; |