summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArif Hussain <arifhussain@codeaurora.org>2016-11-10 13:08:03 -0800
committerqcabuildsw <qcabuildsw@localhost>2016-11-10 19:03:04 -0800
commitc6f3ffa5f77beec4139c1c5920a05129ea59ea0a (patch)
treeb4c88cc25a84d8c3b2f072bc39338ca8b37b5c91
parent52fff2a5e59c1c258a7b4a1653b59b5b42aa30bd (diff)
qcacld-3.0: Use sme_dhcp_start/stop_ind api for dhcp state
Android framework indicates dhcp start and stop using power save (ps disable for dhcp start, ps enable for dhcp stop). Use this new indication method for any of the dhcp dependent operations. Also remove resetting dhcp_done flag in csr_roam_connect() function, as assumption of dhcp will trigger for every new connection is not correct, like in static IP address case there won’t be dhcp indications, and this flag remains false. Change-Id: I3a995d859c39591b0a9fb4bc6e636e580c02dbd4 CRs-Fixed: 1088523
-rw-r--r--core/sme/src/common/sme_api.c2
-rw-r--r--core/sme/src/csr/csr_api_roam.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index cbb373b7f91e..67b329e1930b 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -5663,6 +5663,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal,
sme_release_global_lock(&pMac->sme);
return QDF_STATUS_E_FAILURE;
}
+ pSession->dhcp_done = false;
pMsg = (tAniDHCPInd *) qdf_mem_malloc(sizeof(tAniDHCPInd));
if (NULL == pMsg) {
@@ -5734,6 +5735,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal,
sme_release_global_lock(&pMac->sme);
return QDF_STATUS_E_FAILURE;
}
+ pSession->dhcp_done = true;
pMsg = (tAniDHCPInd *) qdf_mem_malloc(sizeof(tAniDHCPInd));
if (NULL == pMsg) {
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 2f412bd5de34..9f74eca9186d 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -7619,8 +7619,6 @@ QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId,
sme_bss_type_to_string(pProfile->BSSType),
pProfile->BSSType, pProfile->AuthType.authType[0],
pProfile->EncryptionType.encryptionType[0]);
- /* Reset dhcp_done for the fresh connection */
- pSession->dhcp_done = false;
csr_roam_cancel_roaming(pMac, sessionId);
csr_scan_remove_fresh_scan_command(pMac, sessionId);
csr_scan_abort_all_scans(pMac, eCSR_SCAN_ABORT_DEFAULT);