From be03fb8f08b622a9cd37a269002aba7e990a8a47 Mon Sep 17 00:00:00 2001 From: Kabilan Kannan Date: Mon, 14 Nov 2016 01:17:04 -0800 Subject: qcacld-3.0: Fix TDLS teardown failure in concurrency scenario All the TDLS action frames are blocked in the host driver, if the active session count is more than one. Due to this TDLS teardown action frame is blocked in the driver, when the drive establish concurrent sessions. Add changes in host driver to allow TDLS teardown frame, regardless of active session count. Change-Id: If10bacdf2419b6b66c401ab95a79e1334c95064d CRs-Fixed: 1089443 --- core/hdd/src/wlan_hdd_tdls.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index e126b2e1a981..a9da01976c99 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -4176,20 +4176,20 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, return -EAGAIN; } - if (!cds_check_is_tdls_allowed(pAdapter->device_mode)) { - hdd_err("TDLS not allowed, reject TDLS MGMT, action_code=%d", - action_code); - return -EPERM; - } - /* other than teardown frame, mgmt frames are not sent if disabled */ if (SIR_MAC_TDLS_TEARDOWN != action_code) { - /* if tdls_mode is disabled to respond to peer's request */ + if (!cds_check_is_tdls_allowed(pAdapter->device_mode)) { + hdd_err("TDLS not allowed, reject TDLS MGMT, action_code=%d", + action_code); + return -EPERM; + } + /* if tdls_mode is disabled, then decline the peer's request */ if (eTDLS_SUPPORT_DISABLED == pHddCtx->tdls_mode) { hdd_notice(MAC_ADDRESS_STR " TDLS mode is disabled. action %d declined.", MAC_ADDR_ARRAY(peer), action_code); return -ENOTSUPP; - } else if (pHddCtx->tdls_nss_switch_in_progress) { + } + if (pHddCtx->tdls_nss_switch_in_progress) { hdd_err("TDLS antenna switch in progress, action %d declined for " MAC_ADDRESS_STR, action_code, MAC_ADDR_ARRAY(peer)); return -EAGAIN; -- cgit v1.2.3