commit a6d49be5c921617da64524268ceb96c20e765692
author Hoonki Lee <lhoonki@qca.qualcomm.com> Fri Apr 05 09:43:25 2013 -0700
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Mon Apr 08 14:31:14 2013 -0700
tree b5e776b00721420be3473df933ee19875a4c5909
parent 6802b30ea49ecfb43d40ebb4dc48cefa9b672763

scan based teardown across wlan and p2p interface

Find the peer for all interfaces even when scan is issued on
one interface, and use corresponding wiphy dev pointer when
indicating teardown to supplicant.
Change station accepts p2p client device mode.

Change-Id: Ic959dea0855b8bafa631a177d575c07325f702a7
CRs-Fixed: 466996

CORE/HDD/inc/wlan_hdd_tdls.h

diff --git a/CORE/HDD/inc/wlan_hdd_tdls.h b/CORE/HDD/inc/wlan_hdd_tdls.h
index ac3ca96..ba2f938 100644
--- a/CORE/HDD/inc/wlan_hdd_tdls.h
+++ b/CORE/HDD/inc/wlan_hdd_tdls.h
@@ -174,6 +174,8 @@
 
 hddTdlsPeer_t *wlan_hdd_tdls_find_peer(hdd_adapter_t *pAdapter, u8 *mac);
 
+hddTdlsPeer_t *wlan_hdd_tdls_find_all_peer(hdd_context_t *pHddCtx, u8 *mac);
+
 hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter, u8 *mac);
 
 int wlan_hdd_tdls_set_cap(hdd_adapter_t *pAdapter, u8* mac, tTDLSCapType cap);

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 765620e..489b55a 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -2956,7 +2956,8 @@
         }
     }
 #ifdef FEATURE_WLAN_TDLS
-    else if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION ) {
+    else if ((pAdapter->device_mode == WLAN_HDD_INFRA_STATION)
+          || (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) {
         if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER)) {
             StaParams.capability = params->capability;
             StaParams.uapsd_queues = params->uapsd_queues;

CORE/HDD/src/wlan_hdd_tdls.c

diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c
index 676666a..9b3c0bd 100644
--- a/CORE/HDD/src/wlan_hdd_tdls.c
+++ b/CORE/HDD/src/wlan_hdd_tdls.c
@@ -1073,6 +1073,33 @@
     return NULL;
 }
 
+hddTdlsPeer_t *wlan_hdd_tdls_find_all_peer(hdd_context_t *pHddCtx, u8 *mac)
+{
+    hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL;
+    hdd_adapter_t *pAdapter = NULL;
+    tdlsCtx_t *pHddTdlsCtx = NULL;
+    hddTdlsPeer_t *curr_peer= NULL;
+    VOS_STATUS status = 0;
+
+    status = hdd_get_front_adapter ( pHddCtx, &pAdapterNode );
+    while ( NULL != pAdapterNode && VOS_STATUS_SUCCESS == status )
+    {
+        pAdapter = pAdapterNode->pAdapter;
+
+        pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);
+        if (NULL != pHddTdlsCtx)
+        {
+            curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac);
+            if (curr_peer)
+                return curr_peer;
+        }
+        status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext );
+        pAdapterNode = pNext;
+    }
+    return curr_peer;
+}
+
+
 int wlan_hdd_tdls_reset_peer(hdd_adapter_t *pAdapter, u8 *mac)
 {
     hdd_context_t *pHddCtx;
@@ -1479,18 +1506,14 @@
     while ( NULL != pAdapterNode && VOS_STATUS_SUCCESS == status )
     {
        pAdapter = pAdapterNode->pAdapter;
-       if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
-           (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode))
+       pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);
+       if (NULL != pHddTdlsCtx)
        {
-           pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);
-           if (NULL != pHddTdlsCtx)
-           {
-               if(eTDLS_SUPPORT_ENABLED == tdls_mode)
-                   wlan_hdd_tdls_implicit_enable(pHddTdlsCtx);
-               else if((eTDLS_SUPPORT_DISABLED == tdls_mode) ||
-                       (eTDLS_SUPPORT_EXPLICIT_TRIGGER_ONLY == tdls_mode))
-                   wlan_hdd_tdls_implicit_disable(pHddTdlsCtx);
-           }
+           if(eTDLS_SUPPORT_ENABLED == tdls_mode)
+               wlan_hdd_tdls_implicit_enable(pHddTdlsCtx);
+           else if((eTDLS_SUPPORT_DISABLED == tdls_mode) ||
+                   (eTDLS_SUPPORT_EXPLICIT_TRIGGER_ONLY == tdls_mode))
+               wlan_hdd_tdls_implicit_disable(pHddTdlsCtx);
        }
        status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext );
        pAdapterNode = pNext;
@@ -1553,14 +1576,10 @@
     {
         pAdapter = pAdapterNode->pAdapter;
 
-        if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
-            (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode))
+        pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);
+        if (NULL != pHddTdlsCtx)
         {
-            pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);
-            if (NULL != pHddTdlsCtx)
-            {
-                count = count + pHddTdlsCtx->discovery_sent_cnt;
-            }
+            count = count + pHddTdlsCtx->discovery_sent_cnt;
         }
         status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext );
         pAdapterNode = pNext;
@@ -1743,8 +1762,9 @@
                                    ("%s: indicate TDLS teadown (staId %d)"), __func__, pHddCtx->tdlsConnInfo[staIdx].staId) ;
 
 #ifdef CONFIG_TDLS_IMPLICIT
-                    curr_peer = wlan_hdd_tdls_find_peer(pAdapter,pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes);
-                    wlan_hdd_tdls_indicate_teardown(pAdapter, curr_peer, eSIR_MAC_TDLS_TEARDOWN_UNSPEC_REASON);
+                    curr_peer = wlan_hdd_tdls_find_all_peer(pHddCtx, pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes);
+                    if(curr_peer)
+                        wlan_hdd_tdls_indicate_teardown(curr_peer->pHddTdlsCtx->pAdapter, curr_peer, eSIR_MAC_TDLS_TEARDOWN_UNSPEC_REASON);
 #endif
                 }
             }