diff options
| author | Sunil Dutt <usdutt@qti.qualcomm.com> | 2013-11-28 20:04:07 +0530 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-04-16 19:26:38 -0700 |
| commit | 90b7fbcc50699ef9dd85064fc46c75b46b91ec70 (patch) | |
| tree | 103de873e0dc995149de2de71c001811f7fbbf23 | |
| parent | a5dce0e56496092453db77ba87e3d384bb68b985 (diff) | |
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
Change-Id: I39244c248993f0b55463a9110d63adafacfdb066
CRs-fixed: 647554
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_tdls.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c index 3989024c8937..0b0fc2570480 100644 --- a/CORE/HDD/src/wlan_hdd_tdls.c +++ b/CORE/HDD/src/wlan_hdd_tdls.c @@ -303,10 +303,6 @@ static v_VOID_t wlan_hdd_tdls_update_peer_cb( v_PVOID_t userData ) "%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, @@ -321,6 +317,12 @@ static v_VOID_t wlan_hdd_tdls_update_peer_cb( v_PVOID_t userData ) 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) { @@ -398,6 +400,11 @@ static v_VOID_t wlan_hdd_tdls_update_peer_cb( v_PVOID_t userData ) // } } } 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) { |