summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitesh Shah <niteshs@codeaurora.org>2017-04-03 12:53:36 +0530
committerSandeep Puligilla <spuligil@codeaurora.org>2017-04-03 16:51:34 -0700
commitc64512ccd496364779aff168b27276a66192444f (patch)
tree8b97da3088ec64da2b980a470cbbb7b415ec59ba
parentc2d49b5cb039c2480e13062291c242111af87714 (diff)
qcacld-3.0: Teardown TDLS links before starting interface
If the TDLS links exists and SAP comes up, there is a chance that the peer is created for SAP before deleting TDLS peers, thus leading to crash. The fix is to teardown the TDLS links before starting hostapd or starting the association process to avoid TDLS in concurrency case. Change-Id: I06c0d4f8965d3a1e614e8bd89f2d6af0a504fa9e CRs-Fixed: 2027831
-rw-r--r--core/hdd/src/wlan_hdd_cfg80211.c2
-rw-r--r--core/hdd/src/wlan_hdd_hostapd.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 7e442feb62d2..8fc40a89ff66 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -12969,6 +12969,8 @@ static int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter,
goto ret_status;
}
+ wlan_hdd_tdls_disable_offchan_and_teardown_links(pHddCtx);
+
pRoamProfile = &pWextState->roamProfile;
qdf_mem_zero(&hdd_sta_ctx->conn_info.conn_flag,
sizeof(hdd_sta_ctx->conn_info.conn_flag));
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 02558249dbc0..f3394361b5ad 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -7334,6 +7334,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
return -EINVAL;
}
+ wlan_hdd_tdls_disable_offchan_and_teardown_links(pHddCtx);
if (cds_is_hw_mode_change_in_progress()) {
status = qdf_wait_for_connection_update();
if (!QDF_IS_STATUS_SUCCESS(status)) {