瀏覽代碼

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
Jayachandran Sreekumaran 3 年之前
父節點
當前提交
b361cf7444

+ 1 - 1
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
 /**

+ 1 - 2
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;
 

+ 3 - 1
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,