Return-path: Received: from mail2.candelatech.com ([208.74.158.173]:55162 "EHLO mail2.candelatech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729622AbeGMRXo (ORCPT ); Fri, 13 Jul 2018 13:23:44 -0400 From: greearb@candelatech.com To: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, kvalo@codeaurora.org Cc: Ben Greear Subject: [PATCH] ath10k: fix vdev-start timeout on error Date: Fri, 13 Jul 2018 10:08:03 -0700 Message-Id: <1531501683-32299-1-git-send-email-greearb@candelatech.com> (sfid-20180713_190817_235277_8CA05587) Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Ben Greear The vdev-start-response message should cause the completion to fire, even in the error case. Otherwise, the user still gets no useful information and everything is blocked until the timeout period. Add some warning text to print out the invalid status code to aid debugging. Signed-off-by: Ben Greear --- drivers/net/wireless/ath/ath10k/wmi.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index a60de71..ec4cd1e 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -3443,12 +3443,18 @@ void ath10k_wmi_event_vdev_start_resp(struct ath10k *ar, struct sk_buff *skb) ret = ath10k_wmi_pull_vdev_start(ar, skb, &arg); if (ret) { ath10k_warn(ar, "failed to parse vdev start event: %d\n", ret); - return; + goto out; } - if (WARN_ON(__le32_to_cpu(arg.status))) - return; + if (WARN_ON_ONCE(__le32_to_cpu(arg.status))) { + ath10k_warn(ar, "vdev-start-response reports status error: %d\n", + __le32_to_cpu(arg.status)); + /* Setup is done one way or another though, so we should still + * do the completion, so don't return here. + */ + } +out: complete(&ar->vdev_setup_done); } -- 2.4.11