commit 961ecbd5c7c87a631a09b426b9e66756baeb9ac7
author Sunil Dutt <usdutt@qti.qualcomm.com> Thu Nov 28 20:04:07 2013 +0530
committer Kiet Lam <c_kietl@qca.qualcomm.com> Sun Dec 22 14:47:58 2013 -0800
tree f594f9dd48c4a1a711b3a828ffbdb510661d3b53
parent 388ac8f2407b0732ffb83bca7f6d5b5416be7484

TDLS: Check if a peer is forced peer only when initiating setup

TDLS tear down should happen irrespective of the peer being a
forced one or not. Hence only check for the forced peer while
initiating a setup to the peer.
CRs-fixed: 576627

Change-Id: I539bd0b43dbde94223ac5f8f6d77d74bc4515c46

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 160313a..ab54f3d 100644
--- a/CORE/HDD/src/wlan_hdd_tdls.c
+++ b/CORE/HDD/src/wlan_hdd_tdls.c
@@ -285,10 +285,6 @@
                        "%s: " MAC_ADDRESS_STR " link_status %d"
                        " tdls_support %d", __func__, MAC_ADDR_ARRAY(curr_peer->peerMac),
                        curr_peer->link_status, curr_peer->tdls_support);
-            if (pHddCtx->cfg_ini->fTDLSExternalControl &&
-                (FALSE == curr_peer->isForcedPeer)) {
-                continue;
-            }
 
             if (eTDLS_CAP_SUPPORTED == curr_peer->tdls_support) {
                 VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
@@ -303,6 +299,12 @@
 
                 if ((eTDLS_LINK_IDLE == curr_peer->link_status) ||
                     (eTDLS_LINK_DISCOVERING == curr_peer->link_status)){
+
+                    if (pHddCtx->cfg_ini->fTDLSExternalControl &&
+                        (FALSE == curr_peer->isForcedPeer)) {
+                        continue;
+                    }
+
                     if (curr_peer->tx_pkt >=
                             pHddTdlsCtx->threshold_config.tx_packet_n) {
 
@@ -380,6 +382,11 @@
 //                    }
                 }
             } else if (eTDLS_CAP_UNKNOWN == curr_peer->tdls_support) {
+
+                if (pHddCtx->cfg_ini->fTDLSExternalControl &&
+                    (FALSE == curr_peer->isForcedPeer)) {
+                    continue;
+                }
                 if (!TDLS_IS_CONNECTED(curr_peer)) {
                     if (curr_peer->tx_pkt >=
                             pHddTdlsCtx->threshold_config.tx_packet_n) {