diff --git a/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c b/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c index 8fdc488ba2..8275451b8e 100644 --- a/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c +++ b/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c @@ -393,6 +393,11 @@ cm_fill_roam_info(struct wlan_objmgr_vdev *vdev, rsp->connect_rsp.vdev_id = roam_synch_data->roamed_vdev_id; qdf_copy_macaddr(&rsp->connect_rsp.bssid, &roam_synch_data->bssid); + if (!util_scan_is_null_ssid(&roam_synch_data->ssid)) + wlan_vdev_mlme_set_ssid(vdev, + roam_synch_data->ssid.ssid, + roam_synch_data->ssid.length); + status = wlan_vdev_mlme_get_ssid(vdev, rsp->connect_rsp.ssid.ssid, &rsp->connect_rsp.ssid.length); diff --git a/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h b/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h index 6c96e9b221..8dabb9fccf 100644 --- a/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h +++ b/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h @@ -2325,6 +2325,7 @@ struct roam_offload_synch_ind { uint8_t isBeacon; uint8_t roamed_vdev_id; struct qdf_mac_addr bssid; + struct wlan_ssid ssid; struct qdf_mac_addr self_mac; int8_t txMgmtPower; uint32_t auth_status; diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index f8efd6f3a4..26b04ba521 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -2627,6 +2627,11 @@ pe_roam_synch_callback(struct mac_context *mac_ctx, lim_fill_ft_session(mac_ctx, bss_desc, ft_session_ptr, session_ptr, roam_sync_ind_ptr->phy_mode, assoc_rsp); + roam_sync_ind_ptr->ssid.length = + qdf_min((qdf_size_t)ft_session_ptr->ssId.length, + sizeof(roam_sync_ind_ptr->ssid.ssid)); + qdf_mem_copy(roam_sync_ind_ptr->ssid.ssid, ft_session_ptr->ssId.ssId, + roam_sync_ind_ptr->ssid.length); pe_set_rmf_caps(mac_ctx, ft_session_ptr, roam_sync_ind_ptr); /* Next routine may update nss based on dot11Mode */