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

Commit 0d36d71d authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k_htc: Fix WMI command race 



My patch "ath9k_htc: Handle WMI timeouts properly" introduced
a race condition in WMI command processing. The last issued command
should be stored _before_ issuing a WMI command. Not doing this
would result in the WMI event IRQ dropping correct command responses
as invalid.

Fix this race by storing the command id correctly.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ba443701

drivers/net/wireless/ath/ath9k/wmi.c

+4 −4
Original line number Diff line number Diff line
@@ -305,14 +305,14 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id, 
	wmi->cmd_rsp_buf = rsp_buf;

	wmi->cmd_rsp_len = rsp_len;



	ret = ath9k_wmi_cmd_issue(wmi, skb, cmd_id, cmd_len);

	if (ret)

		goto out;



	spin_lock_irqsave(&wmi->wmi_lock, flags);

	wmi->last_cmd_id = cmd_id;

	spin_unlock_irqrestore(&wmi->wmi_lock, flags);



	ret = ath9k_wmi_cmd_issue(wmi, skb, cmd_id, cmd_len);

	if (ret)

		goto out;



	time_left = wait_for_completion_timeout(&wmi->cmd_wait, timeout);

	if (!time_left) {

		ath_print(common, ATH_DBG_WMI,