commit 44b0db0a6d213109ed254e6cc208c7a3e181698d
author Masti, Narayanraddi <c_nmasti@qti.qualcomm.com> Tue Dec 22 11:54:35 2015 +0530
committer Anjaneedevi Kapparapu <akappa@codeaurora.org> Fri Jan 08 23:32:05 2016 +0530
tree 0672f2cdda25257a7b35cfd79f2c74578a41af4d
parent 36c676257d938b87b02aaa655e84acad62ec4596

wlan: Enable/Disable TDLS on p2p remain on channel request

Currently, TDLS mode is not changed on p2p remain on channel request
and if other source enable TDLS during ROC in progress then
TDLS connection may proceed which is not supported i.e
p2p+TDLS is not supported.
Fix is to ensure that TDLS will not be enabled/disabled
until all the  resources agree upon it.

Change-Id: Ibe74bebfcaa69e135b606c1da47d4164ffc3ca40
CRs-Fixed: 959085

CORE/HDD/src/wlan_hdd_p2p.c

diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index f158264..a60a6f2 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -502,6 +502,9 @@
         WLANSAP_CancelRemainOnChannel(
                 (WLAN_HDD_GET_CTX(pAdapter))->pvosContext);
     }
+
+    wlan_hdd_start_stop_tdls_source_timer(pHddCtx, eTDLS_SUPPORT_ENABLED);
+
     hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_ROC);
 }
 
@@ -657,6 +660,8 @@
 
     }
 
+    wlan_hdd_start_stop_tdls_source_timer(pHddCtx, eTDLS_SUPPORT_DISABLED);
+
     pAdapter->is_roc_inprogress = TRUE;
     EXIT();
     return 0;