From 1748fe9b206bb151408c38b1fac90095ad48d7f3 Mon Sep 17 00:00:00 2001 From: Pragaspathi Thilagaraj Date: Fri, 16 Oct 2020 15:26:29 +0530 Subject: [PATCH] qcacld-3.0: Update mobility domain in RSO command The MDID is not updated in RSO command. So FT roaming failure happens. Update the MDID in RSO commands. Change-Id: Ie68b379ab29c063c90d8461d0be34fd09a105e3f CRs-Fixed: 2795319 --- components/wmi/src/wmi_unified_roam_tlv.c | 5 +++-- core/sme/src/csr/csr_api_roam.c | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/components/wmi/src/wmi_unified_roam_tlv.c b/components/wmi/src/wmi_unified_roam_tlv.c index dcc977346ef8..498d51a020c5 100644 --- a/components/wmi/src/wmi_unified_roam_tlv.c +++ b/components/wmi/src/wmi_unified_roam_tlv.c @@ -2255,10 +2255,11 @@ wmi_fill_rso_tlvs(wmi_unified_t wmi_handle, uint8_t *buf, WMITLV_SET_HDR(buf, WMITLV_TAG_ARRAY_STRUC, 0); buf += WMI_TLV_HDR_SIZE; - wmi_debug("RSO_CFG: vdev[%d] 11r TLV psk_msk_len = %d psk_msk_ext:%d", + wmi_debug("RSO_CFG: vdev[%d] 11r TLV psk_msk_len = %d psk_msk_ext:%d md:0x%x", roam_req->vdev_id, roam_offload_11r->psk_msk_len, - roam_offload_11r->psk_msk_ext_len); + roam_offload_11r->psk_msk_ext_len, + roam_offload_11r->mdid); } else { WMITLV_SET_HDR(buf, WMITLV_TAG_ARRAY_STRUC, sizeof(wmi_roam_11i_offload_tlv_param)); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index c45dac474779..462d0f8631be 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -20605,6 +20605,10 @@ static QDF_STATUS csr_cm_roam_scan_offload_fill_lfr3_config( rso_config->rso_11r_info.enable_ft_im_roaming = mac->mlme_cfg->lfr.enable_ft_im_roaming; + rso_config->rso_11r_info.mdid.mdie_present = + session->connectedProfile.mdid.mdie_present; + rso_config->rso_11r_info.mdid.mobility_domain = + session->connectedProfile.mdid.mobility_domain; rso_config->rso_11r_info.r0kh_id_length = session->ftSmeContext.r0kh_id_len; qdf_mem_copy(rso_config->rso_11r_info.r0kh_id,