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/assoc.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/assoc.c')
-rw-r--r-- | drivers/net/wireless/libertas/assoc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c index 54161f1e742a..fcea2a124a56 100644 --- a/drivers/net/wireless/libertas/assoc.c +++ b/drivers/net/wireless/libertas/assoc.c | |||
@@ -272,9 +272,7 @@ static int assoc_helper_wep_keys(struct lbs_private *priv, | |||
272 | else | 272 | else |
273 | priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE; | 273 | priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE; |
274 | 274 | ||
275 | ret = lbs_set_mac_control(priv); | 275 | lbs_set_mac_control(priv); |
276 | if (ret) | ||
277 | goto out; | ||
278 | 276 | ||
279 | mutex_lock(&priv->lock); | 277 | mutex_lock(&priv->lock); |
280 | 278 | ||
@@ -304,9 +302,7 @@ static int assoc_helper_secinfo(struct lbs_private *priv, | |||
304 | memcpy(&priv->secinfo, &assoc_req->secinfo, | 302 | memcpy(&priv->secinfo, &assoc_req->secinfo, |
305 | sizeof(struct lbs_802_11_security)); | 303 | sizeof(struct lbs_802_11_security)); |
306 | 304 | ||
307 | ret = lbs_set_mac_control(priv); | 305 | lbs_set_mac_control(priv); |
308 | if (ret) | ||
309 | goto out; | ||
310 | 306 | ||
311 | /* If RSN is already enabled, don't try to enable it again, since | 307 | /* If RSN is already enabled, don't try to enable it again, since |
312 | * ENABLE_RSN resets internal state machines and will clobber the | 308 | * ENABLE_RSN resets internal state machines and will clobber the |