Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c97329e2 authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville
Browse files

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: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8db4a2b9

drivers/net/wireless/libertas/assoc.c

+2 −6
Original line number Diff line number Diff line
@@ -272,9 +272,7 @@ static int assoc_helper_wep_keys(struct lbs_private *priv, 
	else

		priv->mac_control &= ~CMD_ACT_MAC_WEP_ENABLE;



	ret = lbs_set_mac_control(priv);

	if (ret)

		goto out;

	lbs_set_mac_control(priv);



	mutex_lock(&priv->lock);
@@ -304,9 +302,7 @@ static int assoc_helper_secinfo(struct lbs_private *priv, 
	memcpy(&priv->secinfo, &assoc_req->secinfo,

		sizeof(struct lbs_802_11_security));



	ret = lbs_set_mac_control(priv);

	if (ret)

		goto out;

	lbs_set_mac_control(priv);



	/* If RSN is already enabled, don't try to enable it again, since

	 * ENABLE_RSN resets internal state machines and will clobber the

drivers/net/wireless/libertas/cmd.c

+4 −5
Original line number Diff line number Diff line
@@ -1326,9 +1326,8 @@ int lbs_set_radio_control(struct lbs_private *priv) 
	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;



	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.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);

	return ret;

	lbs_deb_leave(LBS_DEB_CMD);

}



/**

drivers/net/wireless/libertas/decl.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct net_device; 
struct cmd_ctrl_node;

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);