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

Commit 71005be4 authored by Daniel Drake's avatar Daniel Drake Committed by John W. Linville
Browse files

libertas: Set command sequence number later to ensure consistency 



Before this patch, the command sequence number is being set before
lbs_queue_cmd() adds the command to the queue. However, lbs_queue_cmd()
sometimes forces commands to queue-jump (e.g. CMD_802_11_WAKEUP_CONFIRM).
It currently does this without considering that sequence numbers might need
adjusting to keep things running in order.

Fix this by setting the sequence number at a later stage, just before
we're actually submitting the command to the hardware. Also fixes a
possible race where seqnum was being modified outside of the driver
lock.

Signed-off-by: default avatarDaniel Drake <dsd@laptop.org>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 11ad2f52

drivers/net/wireless/libertas/cmd.c

+3 −3
Original line number Diff line number Diff line
@@ -994,6 +994,8 @@ static void lbs_submit_command(struct lbs_private *priv, 
	cmd = cmdnode->cmdbuf;



	spin_lock_irqsave(&priv->driver_lock, flags);

	priv->seqnum++;

	cmd->seqnum = cpu_to_le16(priv->seqnum);

	priv->cur_cmd = cmdnode;

	spin_unlock_irqrestore(&priv->driver_lock, flags);
@@ -1621,11 +1623,9 @@ struct cmd_ctrl_node *__lbs_cmd_async(struct lbs_private *priv, 
	/* Copy the incoming command to the buffer */

	memcpy(cmdnode->cmdbuf, in_cmd, in_cmd_size);



	/* Set sequence number, clean result, move to buffer */

	priv->seqnum++;

	/* Set command, clean result, move to buffer */

	cmdnode->cmdbuf->command = cpu_to_le16(command);

	cmdnode->cmdbuf->size    = cpu_to_le16(in_cmd_size);

	cmdnode->cmdbuf->seqnum  = cpu_to_le16(priv->seqnum);

	cmdnode->cmdbuf->result  = 0;



	lbs_deb_host("PREP_CMD: command 0x%04x\n", command);