From b361cf74447481eead8f9c888f776a6743361a24 Mon Sep 17 00:00:00 2001 From: Jayachandran Sreekumaran Date: Mon, 13 Dec 2021 15:14:55 +0530 Subject: [PATCH] qcacmn: Function parameter update for mlme_max_chan_switch_is_set Update the function parameter for mlme_max_chan_switch_is_set. Change-Id: I0585e328b670f37cb0cd1eb1371ad63b1df1c5f0 CRs-Fixed: 3095312 --- umac/mlme/include/wlan_mlme_cmn.h | 2 +- umac/mlme/mlme_objmgr/dispatcher/src/wlan_cmn_mlme_main.c | 3 +-- umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.c | 4 +++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/umac/mlme/include/wlan_mlme_cmn.h b/umac/mlme/include/wlan_mlme_cmn.h index 46e67fdbbe..2eb2361640 100644 --- a/umac/mlme/include/wlan_mlme_cmn.h +++ b/umac/mlme/include/wlan_mlme_cmn.h @@ -758,7 +758,7 @@ void mlme_set_osif_cm_cb(osif_cm_get_global_ops_cb cm_osif_ops); * * Return: True if max chan switch is enabled else false */ -bool mlme_max_chan_switch_is_set(struct wlan_objmgr_vdev *vdev); +bool mlme_max_chan_switch_is_set(struct wlan_objmgr_psoc *psoc); #ifdef WLAN_FEATURE_DYNAMIC_MAC_ADDR_UPDATE /** diff --git a/umac/mlme/mlme_objmgr/dispatcher/src/wlan_cmn_mlme_main.c b/umac/mlme/mlme_objmgr/dispatcher/src/wlan_cmn_mlme_main.c index 6688c09a06..811ca2dc6b 100644 --- a/umac/mlme/mlme_objmgr/dispatcher/src/wlan_cmn_mlme_main.c +++ b/umac/mlme/mlme_objmgr/dispatcher/src/wlan_cmn_mlme_main.c @@ -557,9 +557,8 @@ void mlme_set_ops_register_cb(mlme_get_global_ops_cb ops_cb) glbl_ops_cb = ops_cb; } -bool mlme_max_chan_switch_is_set(struct wlan_objmgr_vdev *vdev) +bool mlme_max_chan_switch_is_set(struct wlan_objmgr_psoc *psoc) { - struct wlan_objmgr_psoc *psoc = wlan_vdev_get_psoc(vdev); struct psoc_mlme_obj *mlme_psoc_obj; struct psoc_phy_config *phy_config; diff --git a/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.c b/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.c index 26a5f451d2..cb3034e657 100644 --- a/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.c +++ b/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -1349,6 +1350,7 @@ static bool mlme_vdev_subst_suspend_csa_restart_event(void *ctx, uint16_t event, uint16_t event_data_len, void *event_data) { struct vdev_mlme_obj *vdev_mlme = (struct vdev_mlme_obj *)ctx; + struct wlan_objmgr_psoc *psoc = wlan_vdev_get_psoc(vdev_mlme->vdev); bool status; switch (event) { @@ -1373,7 +1375,7 @@ static bool mlme_vdev_subst_suspend_csa_restart_event(void *ctx, case WLAN_VDEV_SM_EV_CSA_COMPLETE: if ((mlme_vdev_is_newchan_no_cac(vdev_mlme) == QDF_STATUS_SUCCESS) || - mlme_max_chan_switch_is_set(vdev_mlme->vdev)) { + mlme_max_chan_switch_is_set(psoc)) { mlme_vdev_sm_transition_to(vdev_mlme, WLAN_VDEV_S_START); mlme_vdev_sm_deliver_event(vdev_mlme,