korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-26 07:44:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

libertas: fix scheduling while atomic bug in CMD_MAC_CONTROL

Browse Source 
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>
This commit is contained in:
Holger Schurig 2008-03-18 11:20:21 +01:00 committed by John W. Linville
parent 8db4a2b986
commit c97329e21f
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/libertas/assoc.c
View File

@ -272,9 +272,7 @@ static int assoc_helper_wep_keys(struct lbs_private *priv,
else else
priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE; priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE;
ret = lbs_set_mac_control(priv); lbs_set_mac_control(priv);
if (ret)
goto out;
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
@ -304,9 +302,7 @@ static int assoc_helper_secinfo(struct lbs_private *priv,
memcpy(&priv->secinfo, &assoc_req->secinfo, memcpy(&priv->secinfo, &assoc_req->secinfo,
sizeof(struct lbs_802_11_security)); sizeof(struct lbs_802_11_security));
ret = lbs_set_mac_control(priv); lbs_set_mac_control(priv);
if (ret)
goto out;
/* If RSN is already enabled, don't try to enable it again, since /* If RSN is already enabled, don't try to enable it again, since
* ENABLE_RSN resets internal state machines and will clobber the * ENABLE_RSN resets internal state machines and will clobber the

9
drivers/net/wireless/libertas/cmd.c
View File

@ -1326,9 +1326,8 @@ int lbs_set_radio_control(struct lbs_private *priv)
return ret; return ret;
} }
int lbs_set_mac_control(struct lbs_private *priv) void lbs_set_mac_control(struct lbs_private *priv)
{ {
int ret = 0;
struct cmd_ds_mac_control cmd; struct cmd_ds_mac_control cmd;
lbs_deb_enter(LBS_DEB_CMD); lbs_deb_enter(LBS_DEB_CMD);
@ -1337,10 +1336,10 @@ int lbs_set_mac_control(struct lbs_private *priv)
cmd.action = cpu_to_le16(priv->mac_control); cmd.action = cpu_to_le16(priv->mac_control);
cmd.reserved = 0; cmd.reserved = 0;
ret = lbs_cmd_with_response(priv, CMD_MAC_CONTROL, &cmd); lbs_cmd_async(priv, CMD_MAC_CONTROL,
&cmd.hdr, sizeof(cmd));
lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret); lbs_deb_leave(LBS_DEB_CMD);
return ret;
} }
/** /**

2
drivers/net/wireless/libertas/decl.h
View File

@ -17,7 +17,7 @@ struct net_device;
struct cmd_ctrl_node; struct cmd_ctrl_node;
struct cmd_ds_command; struct cmd_ds_command;
int lbs_set_mac_control(struct lbs_private *priv); void lbs_set_mac_control(struct lbs_private *priv);
void lbs_send_tx_feedback(struct lbs_private *priv); void lbs_send_tx_feedback(struct lbs_private *priv);