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 15:06:41 -0800 |
| commit | 7ad994dec7d36c319cb35cbf3a920d3bda96e6b0 (patch) | |
| tree | b186f3896514d34a86438b61bf3770fde0e4d960 /drivers/net/wireless/libertas/cmdresp.c | |
| 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/cmdresp.c')
| -rw-r--r-- | drivers/net/wireless/libertas/cmdresp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c index 7bad257fd9c..91136697f69 100644 --- a/drivers/net/wireless/libertas/cmdresp.c +++ b/drivers/net/wireless/libertas/cmdresp.c @@ -861,9 +861,10 @@ int lbs_process_rx_command(struct lbs_private *priv) spin_unlock_irqrestore(&priv->driver_lock, flags); - if (priv->cur_cmd && priv->cur_cmd->callback) - ret = priv->cur_cmd->callback(priv, priv->cur_cmd->callback_arg, resp); - else + if (priv->cur_cmd && priv->cur_cmd->callback) { + ret = priv->cur_cmd->callback(priv, priv->cur_cmd->callback_arg, + (struct cmd_header *) resp); + } else ret = handle_cmd_response(priv, 0, resp); spin_lock_irqsave(&priv->driver_lock, flags); |