commit 5c06a25eb5e605603925fde26d6551db8dabb3d6
author Bala Venkatesh <bjavvaji@codeaurora.org> Thu Jul 12 16:08:04 2018 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jul 18 03:02:49 2018 -0700
tree 075f0cf778e41ee5532dd3ed3e5d587fc3be51dc
parent 57ce875c66d676388dce641092b5399ede9f7988

prima: Enable TDLS after SAP turn off

Currently, as part of start bss TDLS clients are tore down
and TDLS mode is set to disabled with source bit map p2p.
After SAP turn off TDLS mode is not changed to enable again.

Disable the TDLS with concurrency bit map for SAP turn on,
and reenable as part of SAP turn off.

Change-Id: Ie5b786425aed2dccc10a188ffc39474630a3e7aa
CRs-Fixed: 2267011

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 4c615d2..fda4797 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -11061,7 +11061,8 @@
             hdd_update_indoor_channel(pHddCtx, false);
             VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
                  FL("Can't start BSS: update channel list failed"));
-            return eHAL_STATUS_FAILURE;
+            ret = eHAL_STATUS_FAILURE;
+            goto tdls_enable;
         }
 
         /* check if STA is on indoor channel */
@@ -11683,6 +11684,11 @@
     }
 
    clear_bit(SOFTAP_INIT_DONE, &pHostapdAdapter->event_flags);
+
+tdls_enable:
+        if (ret != eHAL_STATUS_SUCCESS)
+            wlan_hdd_tdls_reenable(pHddCtx);
+
    return ret;
 }
 
@@ -12364,9 +12370,9 @@
     /* Reset the current device mode bit mask*/
     wlan_hdd_clear_concurrency_mode(pHddCtx, pAdapter->device_mode);
 
-    if ((pAdapter->device_mode == WLAN_HDD_P2P_DEVICE) &&
-        ((type == NL80211_IFTYPE_P2P_CLIENT) ||
-         (type == NL80211_IFTYPE_P2P_GO)))
+    if (((pAdapter->device_mode == WLAN_HDD_P2P_DEVICE) &&
+        (type == NL80211_IFTYPE_P2P_CLIENT || type == NL80211_IFTYPE_P2P_GO)) ||
+        type == NL80211_IFTYPE_AP)
     {
         /* Notify Mode change in case of concurrency.
          * Below function invokes TDLS teardown Functionality Since TDLS is