aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/hostcmd.h
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-12-11 12:33:30 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:06:41 -0500
commit7ad994dec7d36c319cb35cbf3a920d3bda96e6b0 (patch)
treeb186f3896514d34a86438b61bf3770fde0e4d960 /drivers/net/wireless/libertas/hostcmd.h
parentb15152a4033d4c82015bb79c6b81eeb0a2edeeea (diff)
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.h12
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 {
65 u8 reserved[3]; 65 u8 reserved[3];
66}; 66};
67 67
68struct cmd_header {
69 __le16 command;
70 __le16 size;
71 __le16 seqnum;
72 __le16 result;
73} __attribute__ ((packed));
74
68struct cmd_ctrl_node { 75struct cmd_ctrl_node {
69 struct list_head list; 76 struct list_head list;
70 /* wait for finish or not */ 77 /* wait for finish or not */
71 u16 wait_option; 78 u16 wait_option;
72 /* command response */ 79 /* command response */
73 void *pdata_buf; 80 void *pdata_buf;
74 int (*callback)(struct lbs_private *priv, unsigned long arg, struct cmd_ds_command *resp); 81 int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *);
75 unsigned long callback_arg; 82 unsigned long callback_arg;
76 /* command data */ 83 /* command data */
77 u8 *bufvirtualaddr; 84 u8 *bufvirtualaddr;
@@ -424,6 +431,8 @@ struct cmd_ds_802_11_monitor_mode {
424}; 431};
425 432
426struct cmd_ds_set_boot2_ver { 433struct cmd_ds_set_boot2_ver {
434 struct cmd_header hdr;
435
427 __le16 action; 436 __le16 action;
428 __le16 version; 437 __le16 version;
429}; 438};
@@ -678,7 +687,6 @@ struct cmd_ds_command {
678 struct cmd_ds_bt_access bt; 687 struct cmd_ds_bt_access bt;
679 struct cmd_ds_fwt_access fwt; 688 struct cmd_ds_fwt_access fwt;
680 struct cmd_ds_mesh_access mesh; 689 struct cmd_ds_mesh_access mesh;
681 struct cmd_ds_set_boot2_ver boot2_ver;
682 struct cmd_ds_get_tsf gettsf; 690 struct cmd_ds_get_tsf gettsf;
683 struct cmd_ds_802_11_subscribe_event subscribe_event; 691 struct cmd_ds_802_11_subscribe_event subscribe_event;
684 struct cmd_ds_802_11_beacon_control bcn_ctrl; 692 struct cmd_ds_802_11_beacon_control bcn_ctrl;