qcacld-3.0: Handle more than one ROAM_SYNC_FRAME event

FW can send more than one wmi_roam_sync_frame_event_id before
roam sync event,change done in host code to handle this scenario.

Change-Id: I1ab02ed3e984948b8e57a2f9a2000b9f9493629c
CRs-Fixed: 3116569
This commit is contained in:
Amruta Kulkarni
2022-01-27 15:36:25 -08:00
committed by Madan Koyyalamudi
parent c506dd0386
commit a0d98934c7
2 changed files with 33 additions and 4 deletions

View File

@@ -375,13 +375,15 @@ cm_roam_sync_frame_event_handler(struct wlan_objmgr_psoc *psoc,
{ {
struct wlan_objmgr_vdev *vdev; struct wlan_objmgr_vdev *vdev;
struct rso_config *rso_cfg; struct rso_config *rso_cfg;
struct roam_synch_frame_ind *sync_frame_ind = frame_ind;
struct roam_synch_frame_ind *roam_synch_frame_ind;
uint8_t vdev_id; uint8_t vdev_id;
QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS status = QDF_STATUS_SUCCESS;
if (!frame_ind) if (!sync_frame_ind)
return QDF_STATUS_E_NULL_VALUE; return QDF_STATUS_E_NULL_VALUE;
vdev_id = frame_ind->vdev_id; vdev_id = sync_frame_ind->vdev_id;
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id, vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id,
WLAN_MLME_SB_ID); WLAN_MLME_SB_ID);
@@ -396,6 +398,8 @@ cm_roam_sync_frame_event_handler(struct wlan_objmgr_psoc *psoc,
goto err; goto err;
} }
roam_synch_frame_ind = &rso_cfg->roam_sync_frame_ind;
if (MLME_IS_ROAM_SYNCH_IN_PROGRESS(psoc, vdev_id)) { if (MLME_IS_ROAM_SYNCH_IN_PROGRESS(psoc, vdev_id)) {
mlme_err("Ignoring this event as it is unexpected"); mlme_err("Ignoring this event as it is unexpected");
wlan_cm_free_roam_synch_frame_ind(rso_cfg); wlan_cm_free_roam_synch_frame_ind(rso_cfg);
@@ -403,8 +407,28 @@ cm_roam_sync_frame_event_handler(struct wlan_objmgr_psoc *psoc,
goto err; goto err;
} }
wlan_cm_free_roam_synch_frame_ind(rso_cfg); if (sync_frame_ind->bcn_probe_rsp_len) {
rso_cfg->roam_sync_frame_ind = *frame_ind; roam_synch_frame_ind->bcn_probe_rsp_len =
sync_frame_ind->bcn_probe_rsp_len;
roam_synch_frame_ind->is_beacon =
sync_frame_ind->is_beacon;
roam_synch_frame_ind->bcn_probe_rsp =
sync_frame_ind->bcn_probe_rsp;
}
if (sync_frame_ind->reassoc_req_len) {
roam_synch_frame_ind->reassoc_req_len =
sync_frame_ind->reassoc_req_len;
roam_synch_frame_ind->reassoc_req =
sync_frame_ind->reassoc_req;
}
if (sync_frame_ind->reassoc_rsp_len) {
roam_synch_frame_ind->reassoc_rsp_len =
sync_frame_ind->reassoc_rsp_len;
roam_synch_frame_ind->reassoc_rsp =
sync_frame_ind->reassoc_rsp;
}
err: err:
wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_SB_ID); wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_SB_ID);

View File

@@ -2426,6 +2426,11 @@ extract_roam_sync_frame_event_tlv(wmi_unified_t wmi_handle, void *event,
roam_sync_frame_ind = frame_ptr; roam_sync_frame_ind = frame_ptr;
roam_sync_frame_ind->vdev_id = synch_frame_event->vdev_id; roam_sync_frame_ind->vdev_id = synch_frame_event->vdev_id;
wmi_debug("synch frame payload: LEN bcn:%d, req:%d, rsp:%d",
synch_frame_event->bcn_probe_rsp_len,
synch_frame_event->reassoc_req_len,
synch_frame_event->reassoc_rsp_len);
if (synch_frame_event->bcn_probe_rsp_len) { if (synch_frame_event->bcn_probe_rsp_len) {
roam_sync_frame_ind->bcn_probe_rsp_len = roam_sync_frame_ind->bcn_probe_rsp_len =
synch_frame_event->bcn_probe_rsp_len; synch_frame_event->bcn_probe_rsp_len;