summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArif Hussain <arifhussain@codeaurora.org>2018-04-30 17:47:46 -0700
committernshrivas <nshrivas@codeaurora.org>2018-05-10 16:56:00 -0700
commitba1b25b0ce1ff8b70576b2ecd7df4c312d35a5c8 (patch)
treea1f41789f71aa0421a5f1620f27e853818373e05
parentef64a5c483316e7a45c2d5cb3536b84175c02ce6 (diff)
qcacld-3.0: Fix tCsrRoamConnectedProfile initialization
Use correct size to mem zero tCsrRoamConnectedProfile In csr_roam_save_ndi_connected_info() function. Change-Id: I54d2bef0bd9202971dff47f9b25d43ff40258630 CRs-Fixed: 2232891
-rw-r--r--core/sme/src/nan/nan_datapath_api.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/core/sme/src/nan/nan_datapath_api.c b/core/sme/src/nan/nan_datapath_api.c
index 0fc587cba031..be3d9d6c225f 100644
--- a/core/sme/src/nan/nan_datapath_api.c
+++ b/core/sme/src/nan/nan_datapath_api.c
@@ -422,19 +422,17 @@ void csr_roam_save_ndi_connected_info(tpAniSirGlobal mac_ctx,
tCsrRoamProfile *roam_profile,
tSirBssDescription *bssdesc)
{
- tCsrRoamSession *roam_session = NULL;
- tCsrRoamConnectedProfile *connect_profile = NULL;
+ tCsrRoamSession *roam_session;
+ tCsrRoamConnectedProfile *connect_profile;
roam_session = CSR_GET_SESSION(mac_ctx, session_id);
- if (NULL == roam_session) {
- QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
- FL("session %d not found"), session_id);
+ if (!roam_session) {
+ sme_err("session %d not found", session_id);
return;
}
connect_profile = &roam_session->connectedProfile;
- qdf_mem_set(&roam_session->connectedProfile,
- sizeof(connect_profile), 0);
+ qdf_mem_zero(connect_profile, sizeof(*connect_profile));
connect_profile->AuthType = roam_profile->negotiatedAuthType;
connect_profile->AuthInfo = roam_profile->AuthType;
connect_profile->EncryptionType =
@@ -450,7 +448,7 @@ void csr_roam_save_ndi_connected_info(tpAniSirGlobal mac_ctx,
connect_profile->operationChannel = bssdesc->channelId;
connect_profile->beaconInterval = 0;
qdf_mem_copy(&connect_profile->Keys, &roam_profile->Keys,
- sizeof(roam_profile->Keys));
+ sizeof(roam_profile->Keys));
csr_get_bss_id_bss_desc(mac_ctx, bssdesc, &connect_profile->bssid);
connect_profile->SSID.length = 0;
csr_free_connect_bss_desc(mac_ctx, session_id);