From 78b98265b1ddea9b29da30ada92e8ffef69fcf5b Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Fri, 6 Nov 2015 15:22:46 +0530 Subject: [PATCH] qcacld-3.0: Issue connect immediately if system is in required hw mode Issue the connect command immediately when the system is already in the required hw mode. Currently the connect command is issued immediately only when the concurrent connection update succeeds, i.e., only when a set hw mode succeeds. But, when the driver is already in the required hw mode, the return value would not be success and the connect command is not getting issued immediately. Fixed this by checking the return value which indicates that the driver is already in the required hw mode, and issuing the connect command immediately. Change-Id: I1ef2adf4d92953f47d36bdae41a9d7d8d559a203 CRs-Fixed: 936268 --- core/sme/src/csr/csr_api_scan.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index e66a5417202e..806d5b5f4569 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -4038,14 +4038,18 @@ error: cdf_mem_free(mac_ctx->sme.saved_scan_cmd); mac_ctx->sme.saved_scan_cmd = NULL; } - } else if (CDF_STATUS_E_NOSUPPORT == ret) { - sms_log(mac_ctx, LOGE, FL("conn update not supported")); + } else if ((CDF_STATUS_E_NOSUPPORT == ret) || + (CDF_STATUS_E_ALREADY == ret)) { + sms_log(mac_ctx, LOGE, FL("conn update ret %d"), ret); csr_scan_handle_search_for_ssid(mac_ctx, pCommand); if (mac_ctx->sme.saved_scan_cmd) { cdf_mem_free(mac_ctx->sme.saved_scan_cmd); mac_ctx->sme.saved_scan_cmd = NULL; } } + /* Else: Set hw mode was issued and the saved connect would + * be issued after set hw mode response + */ break; default: break;