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

Commit 38bfab1a authored Dec 16, 2007 by David Woodhouse Committed by David S. Miller Jan 28, 2008

libertas: fix buffer handling of PS_MODE commands and responses



Commit 5b8845345e7385d2eb37fac22ba9ab6905988be5 (or, in case the git
workflow is broken and patches get recommitted, the commit entitled
'libertas: rename and re-type bufvirtualaddr to cmdbuf' by dcbw),
introduced a number of bugs where we once had a pointer to a command
_payload_, but now we use the pointer to the command header instead.

The fix isn't wonderfully pretty for now, but it'll get better when we
finish converting all commands so the structures include the header.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent c6ad3738

drivers/net/wireless/libertas/cmd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1175,7 +1175,7 @@ static void lbs_queue_cmd(struct lbs_private *priv,

		/* Exit_PS command needs to be queued in the header always. */
		if (le16_to_cpu(cmdnode->cmdbuf->command) == CMD_802_11_PS_MODE) {
		struct cmd_ds_802_11_ps_mode psm = (void ) cmdnode->cmdbuf;
		struct cmd_ds_802_11_ps_mode psm = (void ) &cmdnode->cmdbuf[1];

		if (psm->action == cpu_to_le16(CMD_SUBCMD_EXIT_PS)) {
		if (priv->psstate != PS_STATE_FULL_POWER)
		@@ -1889,7 +1889,7 @@ int lbs_execute_next_command(struct lbs_private *priv)
		* PS command. Ignore it if it is not Exit_PS.
		* otherwise send it down immediately.
		*/
		struct cmd_ds_802_11_ps_mode psm = (void )cmd;
		struct cmd_ds_802_11_ps_mode psm = (void )&cmd[1];

		lbs_deb_host(
		"EXEC_NEXT_CMD: PS cmd, action 0x%02x\n",

drivers/net/wireless/libertas/cmdresp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -678,7 +678,7 @@ int lbs_process_rx_command(struct lbs_private *priv)
		priv->cur_cmd_retcode = result;

		if (respcmd == CMD_RET(CMD_802_11_PS_MODE)) {
		struct cmd_ds_802_11_ps_mode psmode = (void ) resp;
		struct cmd_ds_802_11_ps_mode psmode = (void ) &resp[1];
		u16 action = le16_to_cpu(psmode->action);

		lbs_deb_host(