diff options
author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2008-03-18 06:20:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-03-25 16:41:48 -0400 |
commit | c97329e21fc487ebf251c920d46537ff5fb4d8a7 (patch) | |
tree | 03b7a00e3456cb7ee2b59df90984a551ed141f1f /drivers/net/wireless/libertas/cmd.c | |
parent | 8db4a2b986befabd2ad25c269e40444f06a6bda3 (diff) |
libertas: fix scheduling while atomic bug in CMD_MAC_CONTROL
The old code incorrectly used lbs_cmd_with_response() and now uses
lbs_cmd_async().
While there I noticed that there is no real useful return values for
asynchronous command functions, so I made the function "void".
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/cmd.c')
-rw-r--r-- | drivers/net/wireless/libertas/cmd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index be461c5c42ae..be8a170b633f 100644 --- a/drivers/net/wireless/libertas/cmd.c +++ b/drivers/net/wireless/libertas/cmd.c | |||
@@ -1326,9 +1326,8 @@ int lbs_set_radio_control(struct lbs_private *priv) | |||
1326 | return ret; | 1326 | return ret; |
1327 | } | 1327 | } |
1328 | 1328 | ||
1329 | int lbs_set_mac_control(struct lbs_private *priv) | 1329 | void lbs_set_mac_control(struct lbs_private *priv) |
1330 | { | 1330 | { |
1331 | int ret = 0; | ||
1332 | struct cmd_ds_mac_control cmd; | 1331 | struct cmd_ds_mac_control cmd; |
1333 | 1332 | ||
1334 | lbs_deb_enter(LBS_DEB_CMD); | 1333 | lbs_deb_enter(LBS_DEB_CMD); |
@@ -1337,10 +1336,10 @@ int lbs_set_mac_control(struct lbs_private *priv) | |||
1337 | cmd.action = cpu_to_le16(priv->mac_control); | 1336 | cmd.action = cpu_to_le16(priv->mac_control); |
1338 | cmd.reserved = 0; | 1337 | cmd.reserved = 0; |
1339 | 1338 | ||
1340 | ret = lbs_cmd_with_response(priv, CMD_MAC_CONTROL, &cmd); | 1339 | lbs_cmd_async(priv, CMD_MAC_CONTROL, |
1340 | &cmd.hdr, sizeof(cmd)); | ||
1341 | 1341 | ||
1342 | lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret); | 1342 | lbs_deb_leave(LBS_DEB_CMD); |
1343 | return ret; | ||
1344 | } | 1343 | } |
1345 | 1344 | ||
1346 | /** | 1345 | /** |