Commit da25186f authored Aug 22, 2012 by Stone Piao Committed by John W. Linville Sep 05, 2012

mwifiex: fix skb length issue when send a command to firmware



When we send a command to firmware, we assumed that cmd_size
will be always less than or equal to the structure size of
host_cmd_ds_command. However, this is no longer true after
we added AP support. There are some AP commands that Custom
IE TLVs are included in command buffer, hence the cmd_size
gets enlarged by the TLV data. We need to increase the skb
length for the extra data.

Signed-off-by: Stone Piao <piaoyun@marvell.com>
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 785a7de9

drivers/net/wireless/mwifiex/cmdevt.c

+14 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,20 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,
		cmd_code = le16_to_cpu(host_cmd->command);
		cmd_size = le16_to_cpu(host_cmd->size);

		/* Adjust skb length */
		if (cmd_node->cmd_skb->len > cmd_size)
		/*
		* cmd_size is less than sizeof(struct host_cmd_ds_command).
		* Trim off the unused portion.
		*/
		skb_trim(cmd_node->cmd_skb, cmd_size);
		else if (cmd_node->cmd_skb->len < cmd_size)
		/*
		* cmd_size is larger than sizeof(struct host_cmd_ds_command)
		* because we have appended custom IE TLV. Increase skb length
		* accordingly.
		*/
		skb_put(cmd_node->cmd_skb, cmd_size - cmd_node->cmd_skb->len);

		do_gettimeofday(&tstamp);
		dev_dbg(adapter->dev, "cmd: DNLD_CMD: (%lu.%lu): %#x, act %#x, len %d,"