From: Maya Erez <qca_merez@qca.qualcomm.com>
Date: Tue, 8 Aug 2017 11:16:44 +0000 (+0300)
Subject: wil6210: check no_fw_recovery in resume failure recovery
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c6622116c5ae56aec47dd3d63be49cabf591162a;p=openwrt%2Fstaging%2Fblogic.git

wil6210: check no_fw_recovery in resume failure recovery

Reset 11ad device on resume failure only if no_fw_recovery
is not set.

Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---

diff --git a/drivers/net/wireless/ath/wil6210/pm.c b/drivers/net/wireless/ath/wil6210/pm.c
index ce1f384e7f8e..45488292a8fc 100644
--- a/drivers/net/wireless/ath/wil6210/pm.c
+++ b/drivers/net/wireless/ath/wil6210/pm.c
@@ -85,7 +85,9 @@ static int wil_resume_keep_radio_on(struct wil6210_priv *wil)
 	/* Send WMI resume request to the device */
 	rc = wmi_resume(wil);
 	if (rc) {
-		wil_err(wil, "device failed to resume (%d), resetting\n", rc);
+		wil_err(wil, "device failed to resume (%d)\n", rc);
+		if (no_fw_recovery)
+			goto out;
 		rc = wil_down(wil);
 		if (rc) {
 			wil_err(wil, "wil_down failed (%d)\n", rc);