aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/main.c
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-12-11 12:42:16 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:06:42 -0500
commit6e66f03ff78b23d845920739373b1561c546b13f (patch)
treec190caf119aedbcc07d6020226dfd4637ef44970 /drivers/net/wireless/libertas/main.c
parenta8bdcd71fd33e4a919f9f0cb32207c644b70853f (diff)
libertas: convert GET_HW_SPEC to a direct command
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/main.c')
-rw-r--r--drivers/net/wireless/libertas/main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 9a231099212f..9f6c119c2d1b 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -22,6 +22,7 @@
22#include "debugfs.h" 22#include "debugfs.h"
23#include "assoc.h" 23#include "assoc.h"
24#include "join.h" 24#include "join.h"
25#include "cmd.h"
25 26
26#define DRIVER_RELEASE_VERSION "323.p0" 27#define DRIVER_RELEASE_VERSION "323.p0"
27const char lbs_driver_version[] = "COMM-USB8388-" DRIVER_RELEASE_VERSION 28const char lbs_driver_version[] = "COMM-USB8388-" DRIVER_RELEASE_VERSION
@@ -843,10 +844,7 @@ static int lbs_setup_firmware(struct lbs_private *priv)
843 * Read MAC address from HW 844 * Read MAC address from HW
844 */ 845 */
845 memset(priv->current_addr, 0xff, ETH_ALEN); 846 memset(priv->current_addr, 0xff, ETH_ALEN);
846 847 ret = lbs_update_hw_spec(priv);
847 ret = lbs_prepare_and_send_command(priv, CMD_GET_HW_SPEC,
848 0, CMD_OPTION_WAITFORRSP, 0, NULL);
849
850 if (ret) { 848 if (ret) {
851 ret = -1; 849 ret = -1;
852 goto done; 850 goto done;