ath10k: fix sending wmi cmd during the tdls teardown
diff mbox

Message ID 1507183926-711-1-git-send-email-akolli@qti.qualcomm.com
State New
Headers show

Commit Message

akolli@qti.qualcomm.com Oct. 5, 2017, 6:12 a.m. UTC
From: Anilkumar Kolli <akolli@codeaurora.org>

The current firmware 10.4-3.5.1-00035 on QCA9888 supports
TDLS explicit mode, it expects WMI_TDLS_ENABLE_PASSIVE
for tdls setup and WMI_TDLS_DISABLE for tdls teardown.

Signed-off-by: Anilkumar Kolli <akolli@qti.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/wmi.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Kalle Valo Oct. 27, 2017, 1:48 p.m. UTC | #1
akolli@qti.qualcomm.com wrote:

> The current firmware 10.4-3.5.1-00035 on QCA9888 supports
> TDLS explicit mode, it expects WMI_TDLS_ENABLE_PASSIVE
> for tdls setup and WMI_TDLS_DISABLE for tdls teardown.
> 
> Signed-off-by: Anilkumar Kolli <akolli@qti.qualcomm.com>
> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

Patch applied to ath-next branch of ath.git, thanks.

e5b6853e9922 ath10k: fix sending wmi cmd during the tdls teardown

Patch
diff mbox

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 38a97086708b..cad2e42dcef6 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -7870,7 +7870,8 @@  static int ath10k_wmi_10_4_op_get_vdev_subtype(struct ath10k *ar,
 	if (!skb)
 		return ERR_PTR(-ENOMEM);
 
-	if (test_bit(WMI_SERVICE_TDLS_EXPLICIT_MODE_ONLY, ar->wmi.svc_map))
+	if (test_bit(WMI_SERVICE_TDLS_EXPLICIT_MODE_ONLY, ar->wmi.svc_map) &&
+	    state == WMI_TDLS_ENABLE_ACTIVE)
 		state = WMI_TDLS_ENABLE_PASSIVE;
 
 	if (test_bit(WMI_SERVICE_TDLS_UAPSD_BUFFER_STA, ar->wmi.svc_map))