diff options
author | Dan Williams <dcbw@redhat.com> | 2007-12-11 12:33:30 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:06:41 -0500 |
commit | 7ad994dec7d36c319cb35cbf3a920d3bda96e6b0 (patch) | |
tree | b186f3896514d34a86438b61bf3770fde0e4d960 /drivers/net/wireless/libertas/cmd.h | |
parent | b15152a4033d4c82015bb79c6b81eeb0a2edeeea (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/cmd.h')
-rw-r--r-- | drivers/net/wireless/libertas/cmd.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/cmd.h b/drivers/net/wireless/libertas/cmd.h index 546db4996487..259d3e87193f 100644 --- a/drivers/net/wireless/libertas/cmd.h +++ b/drivers/net/wireless/libertas/cmd.h | |||
@@ -7,10 +7,12 @@ | |||
7 | #include "dev.h" | 7 | #include "dev.h" |
8 | 8 | ||
9 | #define lbs_cmd(priv, cmdnr, cmd, callback, callback_arg) \ | 9 | #define lbs_cmd(priv, cmdnr, cmd, callback, callback_arg) \ |
10 | __lbs_cmd(priv, cmdnr, &cmd, sizeof(cmd), callback, callback_arg) | 10 | __lbs_cmd(priv, cmdnr, (struct cmd_header *) &cmd, sizeof(cmd), \ |
11 | callback, callback_arg) | ||
11 | 12 | ||
12 | int __lbs_cmd(struct lbs_private *priv, uint16_t command, void *cmd, int cmd_size, | 13 | int __lbs_cmd(struct lbs_private *priv, uint16_t command, |
13 | int (*callback)(struct lbs_private *, unsigned long, struct cmd_ds_command *), | 14 | struct cmd_header *in_cmd, int in_cmd_size, |
15 | int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *), | ||
14 | unsigned long callback_arg); | 16 | unsigned long callback_arg); |
15 | 17 | ||
16 | #endif /* _LBS_CMD_H */ | 18 | #endif /* _LBS_CMD_H */ |