From aa6ee918d6a8b7c066114abf776bbabbe1c7011a Mon Sep 17 00:00:00 2001 From: Vivek Date: Wed, 2 Feb 2022 00:14:34 +0530 Subject: [PATCH] qcacmn: Rename the MLO multicast macro There is a difference in the macro used in the MLO multicast macro used in control path and DP Changing the macro to be the same as DP code. Also fixed minor issue in the MLO mcast WMI identified while testing with the macro enabled. Change-Id: I0c24a69628336f74d627863dd4bd4c4bef685b6c CRs-Fixed: 3102733 --- umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h | 3 ++- umac/mlme/vdev_mgr/core/src/vdev_mgr_ops.c | 4 ++-- wmi/src/wmi_unified_11be_tlv.c | 9 +++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h index 08231513bc..750be0b496 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -1394,7 +1395,7 @@ bool wlan_vdev_mlme_is_mlo_vdev(struct wlan_objmgr_vdev *vdev) return wlan_vdev_mlme_feat_ext2_cap_get(vdev, WLAN_VDEV_FEXT2_MLO); } -#ifdef WLAN_MLO_MCAST +#ifdef WLAN_MCAST_MLO /** * wlan_vdev_mlme_is_mlo_mcast_vdev() - whether it is mlo mcast vdev or not * @vdev: VDEV object diff --git a/umac/mlme/vdev_mgr/core/src/vdev_mgr_ops.c b/umac/mlme/vdev_mgr/core/src/vdev_mgr_ops.c index f30193bd64..80ff74ce25 100644 --- a/umac/mlme/vdev_mgr/core/src/vdev_mgr_ops.c +++ b/umac/mlme/vdev_mgr/core/src/vdev_mgr_ops.c @@ -235,13 +235,13 @@ vdev_mgr_set_cur_chan_punc_pattern(struct wlan_channel *des_chan, #endif #ifdef WLAN_FEATURE_11BE_MLO -#ifdef WLAN_MLO_MCAST +#ifdef WLAN_MCAST_MLO static inline void vdev_mgr_start_param_update_mlo_mcast(struct wlan_objmgr_vdev *vdev, struct vdev_start_params *param) { if (wlan_vdev_mlme_is_mlo_mcast_vdev(vdev)) - param->mlo_flags.mlo_macst_vdev = 1; + param->mlo_flags.mlo_mcast_vdev = 1; } #else #define vdev_mgr_start_param_update_mlo_mcast(vdev, param) diff --git a/wmi/src/wmi_unified_11be_tlv.c b/wmi/src/wmi_unified_11be_tlv.c index 2a5cd9dfcb..4b0ac2e36d 100644 --- a/wmi/src/wmi_unified_11be_tlv.c +++ b/wmi/src/wmi_unified_11be_tlv.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -64,10 +64,10 @@ size_t vdev_start_mlo_params_size(struct vdev_start_params *req) } #ifdef WLAN_MCAST_MLO -static bool vdev_start_add_mlo_mcast_params(uint32_t mlo_flags, +static void vdev_start_add_mlo_mcast_params(uint32_t *mlo_flags, struct vdev_start_params *req) { - WMI_MLO_FLAGS_SET_MCAST_VDEV(mlo_flags, + WMI_MLO_FLAGS_SET_MCAST_VDEV(*mlo_flags, req->mlo_flags.mlo_mcast_vdev); } #else @@ -94,7 +94,8 @@ uint8_t *vdev_start_add_mlo_params(uint8_t *buf_ptr, WMI_MLO_FLAGS_SET_ASSOC_LINK(mlo_params->mlo_flags.mlo_flags, req->mlo_flags.mlo_assoc_link); - vdev_start_add_mlo_mcast_params(mlo_params->mlo_flags.mlo_flags, req); + vdev_start_add_mlo_mcast_params(&mlo_params->mlo_flags.mlo_flags, + req); return buf_ptr + sizeof(wmi_vdev_start_mlo_params); }