From 679025e5de008569552eccd61b61dcdcaa50e0f7 Mon Sep 17 00:00:00 2001 From: Paul Zhang Date: Thu, 8 Mar 2018 22:39:44 +0800 Subject: [PATCH] qcacld-3.0: set hdd_reassoc_scenario per dev mode Currently, hdd_reset_all_adapters will set hdd_reassoc_scenario as "false" no matter what adapter's dev mode. It may pollute the session.ap's content. Change-Id: I339982e5454d7ef5bd4325b0901c4a81ceed6ab9 CRs-Fixed: 2201535 --- core/hdd/src/wlan_hdd_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index d699c95bc6bd..9db13bb6b26c 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -5069,9 +5069,11 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx) adapter->device_mode); if ((adapter->device_mode == QDF_STA_MODE) || - (adapter->device_mode == QDF_P2P_CLIENT_MODE)) + (adapter->device_mode == QDF_P2P_CLIENT_MODE)) { /* Stop tdls timers */ hdd_notify_tdls_reset_adapter(adapter->hdd_vdev); + adapter->session.station.hdd_reassoc_scenario = false; + } if (hdd_ctx->config->sap_internal_restart && adapter->device_mode == QDF_SAP_MODE) { @@ -5089,7 +5091,6 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx) } hdd_reset_scan_operation(hdd_ctx, adapter); - adapter->session.station.hdd_reassoc_scenario = false; hdd_deinit_tx_rx(adapter); policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,