summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/hdd/src/wlan_hdd_assoc.c6
-rw-r--r--core/hdd/src/wlan_hdd_tdls.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 94a347d3eb54..efa68c0c9143 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -3367,6 +3367,12 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter,
break;
}
+ if (pHddCtx->tdls_nss_switch_in_progress) {
+ hdd_err("TDLS antenna switch is in progress, ignore SHOULD_DISCOVER");
+ status = QDF_STATUS_SUCCESS;
+ break;
+ }
+
curr_peer =
wlan_hdd_tdls_get_peer(pAdapter,
pRoamInfo->peerMac.bytes,
diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c
index 86bebfc4b29e..299b9e4f4666 100644
--- a/core/hdd/src/wlan_hdd_tdls.c
+++ b/core/hdd/src/wlan_hdd_tdls.c
@@ -3955,6 +3955,10 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
" TDLS mode is disabled. action %d declined.",
__func__, MAC_ADDR_ARRAY(peer), action_code);
return -ENOTSUPP;
+ } else 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;
}
}