mwifiex: skip pending commands after function shutdown
During rmmod mwifiex_sdio processing FUNC_SHUTDOWN command is sent to firmware. Firmware expcets only FUNC_INIT once WLAN function is shut down. Any command pending in the command queue should be ignored and freed. Cc: <stable@vger.kernel.org> # 3.8 Tested-by: Daniel Drake <dsd@laptop.org> Tested-by: Marco Cesarano <marco@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
00d7ea11ff
commit
a3e240cacc
|
@ -157,6 +157,20 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cmd_code = le16_to_cpu(host_cmd->command);
|
||||||
|
cmd_size = le16_to_cpu(host_cmd->size);
|
||||||
|
|
||||||
|
if (adapter->hw_status == MWIFIEX_HW_STATUS_RESET &&
|
||||||
|
cmd_code != HostCmd_CMD_FUNC_SHUTDOWN &&
|
||||||
|
cmd_code != HostCmd_CMD_FUNC_INIT) {
|
||||||
|
dev_err(adapter->dev,
|
||||||
|
"DNLD_CMD: FW in reset state, ignore cmd %#x\n",
|
||||||
|
cmd_code);
|
||||||
|
mwifiex_complete_cmd(adapter, cmd_node);
|
||||||
|
mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
/* Set command sequence number */
|
/* Set command sequence number */
|
||||||
adapter->seq_num++;
|
adapter->seq_num++;
|
||||||
host_cmd->seq_num = cpu_to_le16(HostCmd_SET_SEQ_NO_BSS_INFO
|
host_cmd->seq_num = cpu_to_le16(HostCmd_SET_SEQ_NO_BSS_INFO
|
||||||
|
@ -168,9 +182,6 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,
|
||||||
adapter->curr_cmd = cmd_node;
|
adapter->curr_cmd = cmd_node;
|
||||||
spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
|
spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
|
||||||
|
|
||||||
cmd_code = le16_to_cpu(host_cmd->command);
|
|
||||||
cmd_size = le16_to_cpu(host_cmd->size);
|
|
||||||
|
|
||||||
/* Adjust skb length */
|
/* Adjust skb length */
|
||||||
if (cmd_node->cmd_skb->len > cmd_size)
|
if (cmd_node->cmd_skb->len > cmd_size)
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue