qcacmn: Fix umac/cmn_services/obj_mgr documentation

The kernel-doc script identified some kernel-doc issues in the
umac/cmn_services/obj_mgr folder, so fix them.

Change-Id: I0d02b5e174a47b77f9da3304cfc03ed2602b45c7
CRs-Fixed: 3383933

umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h

@@ -117,8 +117,8 @@ enum wlan_objmgr_obj_type {
 };
 
 /**
- * struct wlan_peer_list {
- * @peer_hash[]:    peer sub lists
+ * struct wlan_peer_list - peer list hash
+ * @peer_hash:      peer sub lists
  * @peer_list_lock: List lock, this has to be acquired on
  *		    accessing/updating the list
  *
@@ -216,6 +216,7 @@ typedef void (*wlan_objmgr_peer_status_handler)(
  * @WLAN_NAN_ID:                nan operations
  * @WLAN_REGULATORY_SB_ID:      SB regulatory operations
  * @WLAN_REGULATORY_NB_ID:      NB regulatory operations
+ * @WLAN_OFFCHAN_TXRX_ID:       Offchannel TxRx
  * @WLAN_POLICY_MGR_ID:         Policy Manager operations
  * @WLAN_SON_ID:                SON
  * @WLAN_SA_API_ID:             SA PAI
@@ -264,12 +265,12 @@ typedef void (*wlan_objmgr_peer_status_handler)(
  * @WLAN_MISC_ID:               power manager, PAPI, rate set, etc.
  * @WLAN_FWOL_NB_ID:            fw offload northbound operations
  * @WLAN_FWOL_SB_ID:            fw offload southbound operations
- * @WLAN_PSOC_TARGET_IF_ID      PSOC related target_if operations
+ * @WLAN_PSOC_TARGET_IF_ID:     PSOC related target_if operations
  * @FTM_TIME_SYNC_ID:           ftm time sync operations
- * @WLAN_PKT_CAPTURE_ID         Packet capture operations
+ * @WLAN_PKT_CAPTURE_ID:        Packet capture operations
  * @WLAN_DCS_ID:                DCS operations
  * @WLAN_IOT_SIM_ID:            IOT Simulation feature
- * @WLAN_MLME_CM_ID             Connection Manager reference ID
+ * @WLAN_MLME_CM_ID:            Connection Manager reference ID
  * @WLAN_IF_MGR_ID:             Interface manager reference ID
  * @WLAN_OSIF_SCAN_ID:          SCAN operations in OS IF
  * @WLAN_OSIF_MGMT_ID:          MGMT frame operations in OS IF
@@ -283,8 +284,10 @@ typedef void (*wlan_objmgr_peer_status_handler)(
  * @WLAN_OSIF_CM_ID:            Connection manager osif reference id
  * @WLAN_TXRX_STREAMS_ID:       Preferred TX & RX streams operations
  * @WLAN_MLO_MGR_ID:            MLO manager reference id
+ * @WLAN_MBSS_ID:               MBSS reference ID
  * @WLAN_MGMT_RX_REO_ID:        Management rx reorder reference id
  * @WLAN_MGMT_RX_REO_SIM_ID:    Management rx reorder simulation reference id
+ * @WLAN_TWT_ID:                TWT component id
  * @WLAN_LITE_MON_ID:           Lite monitor operations
  * @WLAN_PRE_CAC_ID:            Pre-CAC operations
  * @WLAN_DP_ID:                 DP component
@@ -410,7 +413,7 @@ typedef enum {
 
 /**
  * string_from_dbgid() - Convert Refcnt dbgid to respective string
- * @id - Reference count debug id
+ * @id: Reference count debug id
  *
  * Debug support function to convert refcnt dbgid to string.
  * Please note to add new string in the array at index equal to

umac/cmn_services/obj_mgr/inc/wlan_objmgr_global_obj.h

@@ -514,7 +514,7 @@ QDF_STATUS wlan_objmgr_unregister_peer_status_handler(
 		wlan_objmgr_peer_status_handler handler,
 		void *args);
 
-/**
+/*
  * APIs to operations on psoc
  */
 typedef void (*wlan_objmgr_psoc_handler)(struct wlan_objmgr_psoc *psoc,
@@ -569,6 +569,7 @@ struct mlo_mgr_context *wlan_objmgr_get_mlo_ctx(void);
 
 /**
  * wlan_objmgr_set_mlo_ctx() - Set MLO context at global umac object
+ * @ctx: MLO context
  *
  * This API is used to set MLO context object at the global umac object
  *

umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 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
@@ -160,7 +160,7 @@ struct osif_pdev_priv;
  * @pdev_feature_caps:  radio specific feature capabilities
  * @pdev_feature_ext_caps:  radio specific feature capabilities extended
  * @pdev_ospriv:        OS specific pointer
- * @macaddr[]:          MAC address
+ * @macaddr:            MAC address
  * @notified_ap_vdev:   ap vdev
  */
 struct wlan_objmgr_pdev_nif {
@@ -239,8 +239,8 @@ struct wlan_objmgr_pdev_objmgr {
  * @pdev_nif:          pdev nif structure
  * @pdev_objmgr:       pdev object manager structure
  * @pdev_mlme:         pdev MLME structure
- * @pdev_comp_priv_obj[]:   component's private object array
- * @obj_status[]:      object status of each component object
+ * @pdev_comp_priv_obj:   component's private object array
+ * @obj_status:        object status of each component object
  * @obj_state:         object state
  * @tgt_if_handle:     Target interface handle
  * @pdev_lock:         lock to protect object
@@ -267,13 +267,13 @@ struct wlan_objmgr_pdev {
 #endif
 };
 
-/**
- ** APIs to Create/Delete Global object APIs
+/*
+ * APIs to Create/Delete Global object APIs
  */
 /**
  * wlan_objmgr_pdev_obj_create() - pdev create
  * @psoc: PSOC object
- * @scn: os private object
+ * @osif_priv: os private object
  *
  * Creates PDEV object, initializes with default values
  * Invokes the registered notifiers to create component object
@@ -287,7 +287,7 @@ struct wlan_objmgr_pdev *wlan_objmgr_pdev_obj_create(
 
 /**
  * wlan_objmgr_pdev_obj_delete() - pdev delete
- * @psoc: PDEV object
+ * @pdev: PDEV object
  *
  * Logically deletes PDEV object,
  * Once all the references are released, object manager invokes the registered
@@ -297,12 +297,12 @@ struct wlan_objmgr_pdev *wlan_objmgr_pdev_obj_create(
  */
 QDF_STATUS wlan_objmgr_pdev_obj_delete(struct wlan_objmgr_pdev *pdev);
 
-/**
- ** APIs to attach/detach component objects
+/*
+ * APIs to attach/detach component objects
  */
 /**
  * wlan_objmgr_pdev_component_obj_attach() - pdev comp object attach
- * @psoc: PDEV object
+ * @pdev: PDEV object
  * @id: Component id
  * @comp_priv_obj: component's private object pointer
  * @status: Component's private object creation status
@@ -320,7 +320,7 @@ QDF_STATUS wlan_objmgr_pdev_component_obj_attach(
 
 /**
  * wlan_objmgr_pdev_component_obj_detach() - pdev comp object detach
- * @psoc: PDEV object
+ * @pdev: PDEV object
  * @id: Component id
  * @comp_priv_obj: component's private object pointer
  *
@@ -335,8 +335,8 @@ QDF_STATUS wlan_objmgr_pdev_component_obj_detach(
 		enum wlan_umac_comp_id id,
 		void *comp_priv_obj);
 
-/**
- ** APIs to operations on pdev objects
+/*
+ * APIs to operations on pdev objects
  */
 
 typedef void (*wlan_objmgr_pdev_op_handler)(struct wlan_objmgr_pdev *pdev,
@@ -413,14 +413,14 @@ QDF_STATUS wlan_objmgr_trigger_pdev_comp_priv_object_deletion(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_vdev_by_id_from_pdev(pdev, vdev_id, dbg_id) \
+		wlan_objmgr_get_vdev_by_id_from_pdev_debug(pdev, \
+		vdev_id, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_pdev_debug(
 			struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
 			wlan_objmgr_ref_dbgid dbg_id,
 			const char *func, int line);
-
-#define wlan_objmgr_get_vdev_by_id_from_pdev(pdev, vdev_id, dbgid) \
-		wlan_objmgr_get_vdev_by_id_from_pdev_debug(pdev, \
-		vdev_id, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_pdev(
 			struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
@@ -444,15 +444,15 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_pdev(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_vdev_by_id_from_pdev_no_state(pdev, \
+	vdev_id, dbg_id) \
+		wlan_objmgr_get_vdev_by_id_from_pdev_no_state_debug(pdev, \
+		vdev_id, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_pdev_no_state_debug(
 			struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
 			wlan_objmgr_ref_dbgid dbg_id,
 			const char *func, int line);
-
-#define wlan_objmgr_get_vdev_by_id_from_pdev_no_state(pdev, \
-	vdev_id, dbgid) \
-		wlan_objmgr_get_vdev_by_id_from_pdev_no_state_debug(pdev, \
-		vdev_id, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_pdev_no_state(
 			struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
@@ -475,14 +475,14 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_pdev_no_state(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_vdev_by_macaddr_from_pdev(pdev, macaddr, dbg_id) \
+		wlan_objmgr_get_vdev_by_macaddr_from_pdev_debug(pdev, macaddr, \
+		dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_pdev_debug(
 		struct wlan_objmgr_pdev *pdev, const uint8_t *macaddr,
 		wlan_objmgr_ref_dbgid dbg_id,
 		const char *fnc, int ln);
-
-#define wlan_objmgr_get_vdev_by_macaddr_from_pdev(pdev, macaddr, dbgid) \
-		wlan_objmgr_get_vdev_by_macaddr_from_pdev_debug(pdev, macaddr, \
-		dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_pdev(
 		struct wlan_objmgr_pdev *pdev, const uint8_t *macaddr,
@@ -506,16 +506,16 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_pdev(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_vdev_by_macaddr_from_pdev_no_state(pdev, macaddr, \
+	dbg_id) \
+		wlan_objmgr_get_vdev_by_macaddr_from_pdev_no_state_debug(pdev, \
+		macaddr, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_vdev
 	*wlan_objmgr_get_vdev_by_macaddr_from_pdev_no_state_debug(
 		struct wlan_objmgr_pdev *pdev, const uint8_t *macaddr,
 		wlan_objmgr_ref_dbgid dbg_id,
 		const char *func, int line);
-
-#define wlan_objmgr_get_vdev_by_macaddr_from_pdev_no_state(pdev, macaddr, \
-	dbgid) \
-		wlan_objmgr_get_vdev_by_macaddr_from_pdev_no_state_debug(pdev, \
-		macaddr, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_pdev_no_state(
 		struct wlan_objmgr_pdev *pdev, const uint8_t *macaddr,
@@ -532,14 +532,14 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_pdev_no_state(
  * Return: reference to first vdev
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_pdev_get_first_vdev(pdev, dbg_id) \
+		wlan_objmgr_pdev_get_first_vdev_debug(pdev, dbg_id, \
+		__func__, __LINE__)
+
 struct wlan_objmgr_vdev *wlan_objmgr_pdev_get_first_vdev_debug(
 		struct wlan_objmgr_pdev *pdev,
 		wlan_objmgr_ref_dbgid dbg_id,
 		const char *func, int line);
-
-#define wlan_objmgr_pdev_get_first_vdev(pdev, dbgid) \
-		wlan_objmgr_pdev_get_first_vdev_debug(pdev, dbgid, \
-		__func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_objmgr_pdev_get_first_vdev(
 		struct wlan_objmgr_pdev *pdev,
@@ -595,8 +595,7 @@ static inline void wlan_pdev_obj_unlock(struct wlan_objmgr_pdev *pdev)
  *
  * API to get the psoc object from PDEV
  *
- * Return:
- * @psoc: PSOC object
+ * Return: PSOC object
  */
 static inline struct wlan_objmgr_psoc *wlan_pdev_get_psoc(
 			struct wlan_objmgr_pdev *pdev)
@@ -869,7 +868,7 @@ static inline void wlan_pdev_reset_ospriv(struct wlan_objmgr_pdev *pdev)
 /**
  * wlan_pdev_set_max_vdev_count() - set pdev max vdev count
  * @pdev: PDEV object
- * @vdev count: Max vdev count
+ * @max_vdev_count: Max vdev count
  *
  * API to set Max vdev count
  *
@@ -1030,7 +1029,7 @@ target_pdev_info_t *wlan_pdev_get_tgt_if_handle(struct wlan_objmgr_pdev *pdev)
 
 /**
  * wlan_pdev_set_max_peer_count() - set max peer count
- * @vdev: PDEV object
+ * @pdev: PDEV object
  * @count: Max peer count
  *
  * API to set max peer count of PDEV
@@ -1088,7 +1087,7 @@ static inline uint64_t wlan_pdev_get_max_beacon_count(
 }
 
 /**
- * wlan_pdev_incr_beacon_count() - incr beacon count for rx beacon frames
+ * wlan_pdev_incr_wlan_beacon_count() - incr beacon count for rx beacon frames
  * @pdev: pdev object
  *
  * API to incr beacon count of pdev
@@ -1102,7 +1101,7 @@ static inline void wlan_pdev_incr_wlan_beacon_count(
 }
 
 /**
- * wlan_pdev_get_wlan_beacon_count() - set wlan beacon count
+ * wlan_pdev_set_wlan_beacon_count() - set wlan beacon count
  * @pdev: pdev object
  * @count: count to reset beacon count
  *
@@ -1117,12 +1116,12 @@ static inline void wlan_pdev_set_wlan_beacon_count(
 }
 
 /**
- * wlan_pdev_get_wlan_beacon_limit() - get wlan beacon limit
+ * wlan_pdev_get_wlan_beacon_count() - get wlan beacon count
  * @pdev: pdev object
  *
- * API to get wlan beacon limit of pdev
+ * API to get wlan beacon count of pdev
  *
- * Return: beacon limit
+ * Return: beacon count
  */
 static inline uint64_t wlan_pdev_get_wlan_beacon_count(
 					struct wlan_objmgr_pdev *pdev)
@@ -1131,7 +1130,7 @@ static inline uint64_t wlan_pdev_get_wlan_beacon_count(
 }
 
 /**
- * wlan_pdev_set_wlan_beacon_count() - set wlan beacon limit
+ * wlan_pdev_set_max_beacon_limit() - set max beacon limit
  * @pdev: pdev object
  * @limit: limit for thresholding
  *
@@ -1146,7 +1145,7 @@ static inline void wlan_pdev_set_max_beacon_limit(
 }
 
 /**
- * wlan_pdev_get_wlan_beacon_limit() - get wlan beacon limit
+ * wlan_pdev_get_max_beacon_limit() - get max beacon limit
  * @pdev: pdev object
  *
  * API to get wlan beacon limit of pdev

umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 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
@@ -16,10 +16,10 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
- /**
-  * DOC: Define the peer data structure of UMAC
-  *	Public APIs to perform operations on Global objects
-  */
+/**
+ * DOC: Define the peer data structure of UMAC
+ *	Public APIs to perform operations on Global objects
+ */
 #ifndef _WLAN_OBJMGR_PEER_OBJ_H_
 #define _WLAN_OBJMGR_PEER_OBJ_H_
 
@@ -132,6 +132,7 @@ enum wlan_peer_state {
  * @state:           State of the peer
  * @seq_num:         Sequence number
  * @rssi:            Last received RSSI value
+ * @is_authenticated: true if peer is authenticated
  * @assoc_peer:      assoc req/response is handled in this peer
  */
 struct wlan_objmgr_peer_mlme {
@@ -156,7 +157,7 @@ struct wlan_objmgr_peer_mlme {
  * @ref_cnt:           Ref count
  * @ref_id_dbg:        Array to track Ref count
  * @print_cnt:         Count to throttle Logical delete prints
- * @wlan_objmgr_trace: Trace ref and deref
+ * @trace:             Trace ref and deref
  */
 struct wlan_objmgr_peer_objmgr {
 	struct wlan_objmgr_vdev *vdev;
@@ -175,11 +176,11 @@ struct wlan_objmgr_peer_objmgr {
  * @psoc_peer:        peer list node for psoc's qdf list
  * @vdev_peer:        peer list node for vdev's qdf list
  * @free_node:        peer list node for free in a delayed work
- * @macaddr[]:        Peer MAC address
+ * @macaddr:          Peer MAC address
  * @peer_mlme:	      Peer MLME common structure
  * @peer_objmgr:      Peer Object manager common structure
- * @peer_comp_priv_obj[]:  Component's private object pointers
- * @obj_status[]:     status of each component object
+ * @peer_comp_priv_obj:  Component's private object pointers
+ * @obj_status:       status of each component object
  * @obj_state:        Status of Peer object
  * @pdev_id:          Pdev ID
  * @peer_lock:        Lock for access/update peer contents
@@ -206,13 +207,13 @@ struct wlan_objmgr_peer {
 #endif
 };
 
-/**
- ** APIs to Create/Delete Global object APIs
+/*
+ * APIs to Create/Delete Global object APIs
  */
 /**
  * wlan_objmgr_peer_obj_create() - peer object create
  * @vdev: VDEV object on which this peer gets created
- * @peer_type: peer type (AP/STA)
+ * @type: peer type (AP/STA)
  * @macaddr: MAC address
  *
  * Creates Peer object, initializes with default values
@@ -273,8 +274,8 @@ static inline QDF_STATUS wlan_delayed_peer_obj_free_deinit(void *data)
 }
 #endif
 
-/**
- ** APIs to attach/detach component objects
+/*
+ * APIs to attach/detach component objects
  */
 /**
  * wlan_objmgr_peer_component_obj_attach() - attach comp object to peer
@@ -311,8 +312,8 @@ QDF_STATUS wlan_objmgr_peer_component_obj_detach(
 		enum wlan_umac_comp_id id,
 		void *comp_priv_obj);
 
-/**
- ** APIs to operations on peer objects
+/*
+ * APIs to operations on peer objects
  */
 
 /**
@@ -363,7 +364,7 @@ void *wlan_objmgr_peer_get_comp_private_obj(
 
 /**
  * wlan_peer_obj_lock() - Acquire PEER spinlock
- * @psoc: PEER object
+ * @peer: PEER object
  *
  * API to acquire PEER spin lock
  * Parent lock should not be taken in child lock context
@@ -431,12 +432,12 @@ static inline void wlan_peer_obj_unlock(struct wlan_objmgr_peer *peer)
  * Return: void
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_peer_get_ref(peer, id) \
+		wlan_objmgr_peer_get_ref_debug(peer, id, __func__, __LINE__)
+
 void wlan_objmgr_peer_get_ref_debug(struct wlan_objmgr_peer *peer,
 				    wlan_objmgr_ref_dbgid id,
 				    const char *func, int line);
-
-#define wlan_objmgr_peer_get_ref(peer, dbgid) \
-		wlan_objmgr_peer_get_ref_debug(peer, dbgid, __func__, __LINE__)
 #else
 void wlan_objmgr_peer_get_ref(struct wlan_objmgr_peer *peer,
 					wlan_objmgr_ref_dbgid id);
@@ -452,13 +453,13 @@ void wlan_objmgr_peer_get_ref(struct wlan_objmgr_peer *peer,
  * Return: void
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_peer_try_get_ref(peer, id) \
+		wlan_objmgr_peer_try_get_ref_debug(peer, id, \
+		__func__, __LINE__)
+
 QDF_STATUS wlan_objmgr_peer_try_get_ref_debug(struct wlan_objmgr_peer *peer,
 					      wlan_objmgr_ref_dbgid id,
 					      const char *func, int line);
-
-#define wlan_objmgr_peer_try_get_ref(peer, dbgid) \
-		wlan_objmgr_peer_try_get_ref_debug(peer, dbgid, \
-		__func__, __LINE__)
 #else
 QDF_STATUS wlan_objmgr_peer_try_get_ref(struct wlan_objmgr_peer *peer,
 						 wlan_objmgr_ref_dbgid id);
@@ -475,13 +476,13 @@ QDF_STATUS wlan_objmgr_peer_try_get_ref(struct wlan_objmgr_peer *peer,
  * Return: void
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_peer_release_ref(peer, id) \
+		wlan_objmgr_peer_release_ref_debug(peer, id, \
+		__func__, __LINE__)
+
 void wlan_objmgr_peer_release_ref_debug(struct wlan_objmgr_peer *peer,
 					wlan_objmgr_ref_dbgid id,
 					const char *func, int line);
-
-#define wlan_objmgr_peer_release_ref(peer, dbgid) \
-		wlan_objmgr_peer_release_ref_debug(peer, dbgid, \
-		__func__, __LINE__)
 #else
 void wlan_objmgr_peer_release_ref(struct wlan_objmgr_peer *peer,
 						 wlan_objmgr_ref_dbgid id);
@@ -497,21 +498,20 @@ void wlan_objmgr_peer_release_ref(struct wlan_objmgr_peer *peer,
  *
  * API to get the next peer of given peer (of psoc's peer list)
  *
- * Return:
- * @next_peer: PEER object
+ * Return: PEER object
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_peer_get_next_peer_of_psoc_ref(peer_list, hash_index, peer, \
+	dbg_id) \
+		wlan_peer_get_next_peer_of_psoc_ref_debug(peer_list, \
+		hash_index, peer, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_peer_get_next_peer_of_psoc_ref_debug(
 				struct wlan_peer_list *peer_list,
 				uint8_t hash_index,
 				struct wlan_objmgr_peer *peer,
 				wlan_objmgr_ref_dbgid dbg_id,
 				const char *func, int line);
-
-#define wlan_peer_get_next_peer_of_psoc_ref(peer_list, hash_index, peer, \
-	dbgid) \
-		wlan_peer_get_next_peer_of_psoc_ref_debug(peer_list, \
-		hash_index, peer, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_peer_get_next_peer_of_psoc_ref(
 				struct wlan_peer_list *peer_list,
@@ -530,21 +530,20 @@ struct wlan_objmgr_peer *wlan_peer_get_next_peer_of_psoc_ref(
  *
  * API to get the next peer of given peer (of psoc's peer list)
  *
- * Return:
- * @next_peer: PEER object
+ * Return: PEER object
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_peer_get_next_active_peer_of_psoc(peer_list, hash_index, \
+	peer, dbg_id) \
+		wlan_peer_get_next_active_peer_of_psoc_debug(peer_list, \
+		hash_index, peer, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_peer_get_next_active_peer_of_psoc_debug(
 					struct wlan_peer_list *peer_list,
 					uint8_t hash_index,
 					struct wlan_objmgr_peer *peer,
 					wlan_objmgr_ref_dbgid dbg_id,
 					const char *func, int line);
-
-#define wlan_peer_get_next_active_peer_of_psoc(peer_list, hash_index, \
-	peer, dbgid) \
-		wlan_peer_get_next_active_peer_of_psoc_debug(peer_list, \
-		hash_index, peer, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_peer_get_next_active_peer_of_psoc(
 					struct wlan_peer_list *peer_list,
@@ -562,20 +561,19 @@ struct wlan_objmgr_peer *wlan_peer_get_next_active_peer_of_psoc(
  *
  * API to get the next active peer of given peer (of vdev's peer list)
  *
- * Return:
- * @next_peer: PEER object
+ * Return: PEER object
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_peer_get_next_active_peer_of_vdev(vdev, peer_list, peer, dbg_id) \
+		wlan_peer_get_next_active_peer_of_vdev_debug(vdev, peer_list, \
+		peer, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_peer_get_next_active_peer_of_vdev_debug(
 				struct wlan_objmgr_vdev *vdev,
 				qdf_list_t *peer_list,
 				struct wlan_objmgr_peer *peer,
 				wlan_objmgr_ref_dbgid dbg_id,
 				const char *func, int line);
-
-#define wlan_peer_get_next_active_peer_of_vdev(vdev, peer_list, peer, dbgid) \
-		wlan_peer_get_next_active_peer_of_vdev_debug(vdev, peer_list, \
-		peer, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_peer_get_next_active_peer_of_vdev(
 				struct wlan_objmgr_vdev *vdev,
@@ -592,19 +590,18 @@ struct wlan_objmgr_peer *wlan_peer_get_next_active_peer_of_vdev(
  *
  * API to get the active head peer of given peer (of vdev's peer list)
  *
- * Return:
- * @peer: active head peer
+ * Return: active head peer
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_vdev_peer_list_peek_active_head(vdev, peer_list, dbg_id) \
+		wlan_vdev_peer_list_peek_active_head_debug(vdev, peer_list, \
+		dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_vdev_peer_list_peek_active_head_debug(
 				struct wlan_objmgr_vdev *vdev,
 				qdf_list_t *peer_list,
 				wlan_objmgr_ref_dbgid dbg_id,
 				const char *func, int line);
-
-#define wlan_vdev_peer_list_peek_active_head(vdev, peer_list, dbgid) \
-		wlan_vdev_peer_list_peek_active_head_debug(vdev, peer_list, \
-		dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_vdev_peer_list_peek_active_head(
 				struct wlan_objmgr_vdev *vdev,
@@ -621,19 +618,19 @@ struct wlan_objmgr_peer *wlan_vdev_peer_list_peek_active_head(
  *
  * API to get the head peer of given peer (of psoc's peer list)
  *
- * Return:
- * @peer: head peer
+ * Return: head peer
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_psoc_peer_list_peek_head_ref(peer_list, hash_index, dbg_id) \
+		wlan_psoc_peer_list_peek_head_ref_debug(peer_list, hash_index, \
+		dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_psoc_peer_list_peek_head_ref_debug(
 					struct wlan_peer_list *peer_list,
 					uint8_t hash_index,
 					wlan_objmgr_ref_dbgid dbg_id,
 					const char *func, int line);
 
-#define wlan_psoc_peer_list_peek_head_ref(peer_list, hash_index, dbgid) \
-		wlan_psoc_peer_list_peek_head_ref_debug(peer_list, hash_index, \
-		dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_psoc_peer_list_peek_head_ref(
 					struct wlan_peer_list *peer_list,
@@ -649,19 +646,18 @@ struct wlan_objmgr_peer *wlan_psoc_peer_list_peek_head_ref(
  *
  * API to get the head peer of given peer (of psoc's peer list)
  *
- * Return:
- * @peer: head peer
+ * Return: head peer
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_psoc_peer_list_peek_active_head(peer_list, hash_index, dbg_id) \
+		wlan_psoc_peer_list_peek_active_head_debug(peer_list, \
+		hash_index, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_psoc_peer_list_peek_active_head_debug(
 					struct wlan_peer_list *peer_list,
 					uint8_t hash_index,
 					wlan_objmgr_ref_dbgid dbg_id,
 					const char *func, int line);
-
-#define wlan_psoc_peer_list_peek_active_head(peer_list, hash_index, dbgid) \
-		wlan_psoc_peer_list_peek_active_head_debug(peer_list, \
-		hash_index, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_psoc_peer_list_peek_active_head(
 					struct wlan_peer_list *peer_list,
@@ -677,8 +673,7 @@ struct wlan_objmgr_peer *wlan_psoc_peer_list_peek_active_head(
  *
  * Caller need to acquire lock with wlan_peer_obj_lock()
  *
- * Return:
- * @peer: head peer
+ * Return: head peer
  */
 static inline struct wlan_objmgr_peer *wlan_psoc_peer_list_peek_head(
 					qdf_list_t *peer_list)
@@ -702,8 +697,7 @@ static inline struct wlan_objmgr_peer *wlan_psoc_peer_list_peek_head(
  *
  * Caller need to acquire lock with wlan_peer_obj_lock()
  *
- * Return:
- * @peer: head peer
+ * Return: head peer
  */
 static inline struct wlan_objmgr_peer *wlan_vdev_peer_list_peek_head(
 					qdf_list_t *peer_list)
@@ -721,14 +715,14 @@ static inline struct wlan_objmgr_peer *wlan_vdev_peer_list_peek_head(
 
 /**
  * wlan_peer_get_next_peer_of_vdev() - get next peer of vdev list
+ * @peer_list: PEER object list
  * @peer: PEER object
  *
  * API to get the next peer of given peer (of vdev's peer list)
  *
  * Caller need to acquire lock with wlan_peer_obj_lock()
  *
- * Return:
- * @next_peer: PEER object
+ * Return: PEER object
  */
 static inline struct wlan_objmgr_peer *wlan_peer_get_next_peer_of_vdev(
 			qdf_list_t *peer_list, struct wlan_objmgr_peer *peer)
@@ -753,7 +747,7 @@ static inline struct wlan_objmgr_peer *wlan_peer_get_next_peer_of_vdev(
 
 /**
  * wlan_peer_set_next_peer_of_vdev() - add peer to vdev peer list
- * @peer: PEER object
+ * @peer_list: PEER object list
  * @new_peer: PEER object
  *
  * API to set as the next peer to given peer (of vdev's peer list)
@@ -780,8 +774,7 @@ static inline void wlan_peer_set_next_peer_of_vdev(qdf_list_t *peer_list,
  *
  * Caller need to acquire lock with wlan_peer_obj_lock()
  *
- * Return:
- * @next_peer: PEER object
+ * Return: PEER object
  */
 static inline struct wlan_objmgr_peer *wlan_peer_get_next_peer_of_psoc(
 			qdf_list_t *peer_list, struct wlan_objmgr_peer *peer)
@@ -806,7 +799,7 @@ static inline struct wlan_objmgr_peer *wlan_peer_get_next_peer_of_psoc(
 
 /**
  * wlan_peer_set_next_peer_of_psoc() - add peer to psoc peer list
- * @peer: PEER object
+ * @peer_list: PEER object list
  * @new_peer: PEER object
  *
  * API to set as the next peer to given peer (of psoc's peer list)
@@ -827,7 +820,7 @@ static inline void wlan_peer_set_next_peer_of_psoc(qdf_list_t *peer_list,
 /**
  * wlan_peer_set_peer_type() - set peer type
  * @peer: PEER object
- * @peer_type: type of PEER
+ * @type: type of PEER
  *
  * API to set peer type
  *
@@ -845,8 +838,7 @@ static inline void wlan_peer_set_peer_type(struct wlan_objmgr_peer *peer,
  *
  * API to get peer type
  *
- * Return:
- * @peer_type: type of PEER
+ * Return: type of PEER
  */
 static inline enum wlan_peer_type wlan_peer_get_peer_type(
 				struct wlan_objmgr_peer *peer)
@@ -875,8 +867,7 @@ static inline void wlan_peer_set_phymode(struct wlan_objmgr_peer *peer,
  *
  * API to get phymode
  *
- * Return:
- * @phymode: phymode of PEER
+ * Return: phymode of PEER
  */
 static inline enum wlan_phymode wlan_peer_get_phymode(
 				struct wlan_objmgr_peer *peer)
@@ -905,8 +896,7 @@ static inline void wlan_peer_set_rssi(struct wlan_objmgr_peer *peer,
  *
  * API to get RSSI
  *
- * Return:
- * @rssi: RSSI of PEER
+ * Return: RSSI of PEER
  */
 static inline int8_t wlan_peer_get_rssi(
 				struct wlan_objmgr_peer *peer)
@@ -955,8 +945,7 @@ QDF_STATUS wlan_peer_update_macaddr(struct wlan_objmgr_peer *peer,
  *
  * Caller need to acquire lock with wlan_peer_obj_lock()
  *
- * Return:
- * @macaddr: MAC address
+ * Return: MAC address
  */
 static inline uint8_t *wlan_peer_get_macaddr(struct wlan_objmgr_peer *peer)
 {
@@ -970,8 +959,7 @@ static inline uint8_t *wlan_peer_get_macaddr(struct wlan_objmgr_peer *peer)
  *
  * API to get peer's vdev
  *
- * Return:
- * @vdev: VDEV object
+ * Return: VDEV object
  */
 static inline struct wlan_objmgr_vdev *wlan_peer_get_vdev(
 			struct wlan_objmgr_peer *peer)
@@ -1055,7 +1043,7 @@ static inline void wlan_peer_mlme_flag_ext_set(struct wlan_objmgr_peer *peer,
 }
 
 /**
- * wlan_peer_mlme_flag_clear() - mlme ext flag clear
+ * wlan_peer_mlme_flag_ext_clear() - mlme ext flag clear
  * @peer: PEER object
  * @flag: ext flag to be cleared
  *

umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h

@@ -312,7 +312,7 @@ struct wlan_objmgr_psoc_user_config {
  * @soc_fw_ext2_caps: FW ext2 capabilities
  * @soc_feature_caps:Feature capabilities
  * @soc_op_flags:    Flags to set/reset during operation
- * @soc_hw_macaddr[]:HW MAC address
+ * @soc_hw_macaddr:  HW MAC address
  * @user_config:     user config from OS layer
  */
 struct wlan_objmgr_psoc_nif {
@@ -327,7 +327,7 @@ struct wlan_objmgr_psoc_nif {
 	struct wlan_objmgr_psoc_user_config user_config;
 };
 
-/**
+/*
  * struct wlan_objmgr_psoc_objmgr - psoc object manager sub structure
  * @psoc_id:              The PSOC's numeric Id
  * @wlan_pdev_count:      PDEV count
@@ -338,13 +338,16 @@ struct wlan_objmgr_psoc_nif {
  * @wlan_peer_count:      PEER count
  * @max_peer_count:       Max no. of peers supported by this PSOC
  * @temp_peer_count:      Temporary peer count
- * @wlan_pdev_list[]:     PDEV list
- * @wlan_vdev_list[]:     VDEV list
- * @wlan_vdev_id_map[]:   VDEV id map, to allocate free ids
+ * @wlan_pdev_list:       PDEV list
+ * @wlan_vdev_list:       VDEV list
+ * @wlan_vdev_id_map:     VDEV id map, to allocate free ids
  * @peer_list:            Peer list
  * @ref_cnt:              Ref count
  * @ref_id_dbg:           Array to track Ref count
  * @qdf_dev:              QDF Device
+ *
+ * NB: not using kernel-doc format since the kernel-doc script doesn't
+ *     handle the qdf_bitmap() macro
  */
 struct wlan_objmgr_psoc_objmgr {
 	uint8_t psoc_id;
@@ -397,8 +400,8 @@ struct wlan_soc_timer {
  * @soc_cb:                south bound callbacks
  * @soc_timer:             soc timer for inactivity
  * @soc_concurrency:       concurrency info
- * @soc_comp_priv_obj[]:   component private object pointers
- * @obj_status[]:          component object status
+ * @soc_comp_priv_obj:     component private object pointers
+ * @obj_status:            component object status
  * @obj_state:             object state
  * @tgt_if_handle:         target interface handle
  * @dp_handle:             DP module handle
@@ -428,10 +431,10 @@ struct wlan_objmgr_psoc {
  * @regcap1: CAP1 capabilities bit map, see REGDMN_CAP1_ defines
  * @regcap2: REGDMN EEPROM CAP, see REGDMN_EEPROM_EEREGCAP_ defines
  * @wireless_modes: REGDMN MODE, see REGDMN_MODE_ enum
- * @low_2ghz_chan: 2G channel low
- * @high_2ghz_chan: 2G channel High
- * @low_5ghz_chan: 5G channel low
- * @high_5ghz_chan: 5G channel High
+ * @low_2ghz_chan: 2 GHz channel low
+ * @high_2ghz_chan: 2 GHz channel High
+ * @low_5ghz_chan: 5 GHz channel low
+ * @high_5ghz_chan: 5 GHz channel High
  */
 struct wlan_psoc_host_hal_reg_capabilities_ext {
 	uint32_t phy_id;
@@ -457,8 +460,8 @@ struct wlan_psoc_host_hal_reg_capabilities_ext2 {
 	uint64_t wireless_modes_ext;
 };
 
-/**
- ** APIs to Create/Delete Global object APIs
+/*
+ * APIs to Create/Delete Global object APIs
  */
 /**
  * wlan_objmgr_psoc_obj_create() - psoc object create
@@ -487,8 +490,8 @@ struct wlan_objmgr_psoc *wlan_objmgr_psoc_obj_create(uint32_t phy_version,
  */
 QDF_STATUS wlan_objmgr_psoc_obj_delete(struct wlan_objmgr_psoc *psoc);
 
-/**
- ** APIs to attach/detach component objects
+/*
+ * APIs to attach/detach component objects
  */
 
 /**
@@ -526,8 +529,8 @@ QDF_STATUS wlan_objmgr_psoc_component_obj_detach(
 		enum wlan_umac_comp_id id,
 		void *comp_priv_obj);
 
-/**
- ** APIs to operations on psoc objects
+/*
+ * APIs to operations on psoc objects
  */
 typedef void (*wlan_objmgr_op_handler)(struct wlan_objmgr_psoc *psoc,
 					void *object,
@@ -637,13 +640,13 @@ QDF_STATUS wlan_objmgr_trigger_psoc_comp_priv_object_deletion(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_peer_by_mac(psoc, macaddr, dbg_id) \
+		wlan_objmgr_get_peer_by_mac_debug(psoc, macaddr, dbg_id, \
+		__func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_by_mac_debug(
 		struct wlan_objmgr_psoc *psoc, uint8_t *macaddr,
 		wlan_objmgr_ref_dbgid dbg_id, const char *func, int line);
-
-#define wlan_objmgr_get_peer_by_mac(psoc, macaddr, dbgid) \
-		wlan_objmgr_get_peer_by_mac_debug(psoc, macaddr, dbgid, \
-		__func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_by_mac(
 		struct wlan_objmgr_psoc *psoc, uint8_t *macaddr,
@@ -667,14 +670,14 @@ struct wlan_objmgr_peer *wlan_objmgr_get_peer_by_mac(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_peer(psoc, pdev_id, macaddr, dbg_id) \
+		wlan_objmgr_get_peer_debug(psoc, pdev_id, macaddr, dbg_id, \
+		__func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_debug(
 			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
 			const uint8_t *macaddr, wlan_objmgr_ref_dbgid dbg_id,
 			const char *func, int line);
-
-#define wlan_objmgr_get_peer(psoc, pdev_id, macaddr, dbgid) \
-		wlan_objmgr_get_peer_debug(psoc, pdev_id, macaddr, dbgid, \
-		__func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_objmgr_get_peer(
 			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
@@ -698,14 +701,14 @@ struct wlan_objmgr_peer *wlan_objmgr_get_peer(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_peer_nolock(psoc, pdev_id, macaddr, dbg_id) \
+		wlan_objmgr_get_peer_nolock_debug(psoc, pdev_id, macaddr, \
+		dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_nolock_debug(
 			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
 			uint8_t *macaddr, wlan_objmgr_ref_dbgid dbg_id,
 			const char *func, int line);
-
-#define wlan_objmgr_get_peer_nolock(psoc, pdev_id, macaddr, dbgid) \
-		wlan_objmgr_get_peer_nolock_debug(psoc, pdev_id, macaddr, \
-		dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_nolock(
 			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
@@ -729,14 +732,14 @@ struct wlan_objmgr_peer *wlan_objmgr_get_peer_nolock(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_peer_logically_deleted(psoc, macaddr, dbg_id) \
+		wlan_objmgr_get_peer_logically_deleted_debug(psoc, macaddr, \
+		dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_logically_deleted_debug(
 			struct wlan_objmgr_psoc *psoc, uint8_t *macaddr,
 			wlan_objmgr_ref_dbgid dbg_id,
 			const char *func, int line);
-
-#define wlan_objmgr_get_peer_logically_deleted(psoc, macaddr, dbgid) \
-		wlan_objmgr_get_peer_logically_deleted_debug(psoc, macaddr, \
-		dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_logically_deleted(
 			struct wlan_objmgr_psoc *psoc, uint8_t *macaddr,
@@ -761,20 +764,52 @@ struct wlan_objmgr_peer *wlan_objmgr_get_peer_logically_deleted(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_peer_no_state(psoc, pdev_id, macaddr, dbg_id) \
+		wlan_objmgr_get_peer_no_state_debug(psoc, pdev_id, macaddr, \
+		dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_no_state_debug(
 			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
 			uint8_t *macaddr, wlan_objmgr_ref_dbgid dbg_id,
 			const char *func, int line);
-
-#define wlan_objmgr_get_peer_no_state(psoc, pdev_id, macaddr, dbgid) \
-		wlan_objmgr_get_peer_no_state_debug(psoc, pdev_id, macaddr, \
-		dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_no_state(
 			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
 			uint8_t *macaddr, wlan_objmgr_ref_dbgid dbg_id);
 #endif
 
+#ifdef WLAN_OBJMGR_REF_ID_TRACE
+/**
+ * wlan_objmgr_populate_logically_deleted_peerlist_by_mac_n_vdev_debug() -
+ *                                                           get peer from psoc
+ *                                                           peer list using
+ *                                                           mac and vdev
+ *                                                           self mac
+ * @psoc: PSOC object
+ * @pdev_id: Pdev id
+ * @macaddr: MAC address
+ * @bssid: BSSID address. NULL mac means search all.
+ * @dbg_id: id of the caller
+ * @func: function name
+ * @line: line number
+ *
+ * API to finds peer object pointer by MAC addr and BSSID from
+ * peer hash list, bssid check is done on matching peer
+ *
+ * Return: list of peer pointer pointers
+ *         NULL on FAILURE
+ */
+qdf_list_t *wlan_objmgr_populate_logically_deleted_peerlist_by_mac_n_vdev_debug(
+			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
+			uint8_t *bssid, uint8_t *macaddr,
+			wlan_objmgr_ref_dbgid dbg_id,
+			const char *func, int line);
+
+#define wlan_objmgr_populate_logically_deleted_peerlist_by_mac_n_vdev( \
+	psoc, pdev_id, bssid, macaddr, dbgid) \
+		wlan_objmgr_populate_logically_deleted_peerlist_by_mac_n_vdev_debug( \
+		psoc, pdev_id, bssid, macaddr, dbgid, __func__, __LINE__)
+#else
 /**
  * wlan_objmgr_populate_logically_deleted_peerlist_by_mac_n_vdev() - get peer from
  *                                                psoc peer list using
@@ -796,18 +831,6 @@ struct wlan_objmgr_peer *wlan_objmgr_get_peer_no_state(
  * Return: List of peer pointers
  *         NULL on FAILURE
  */
-#ifdef WLAN_OBJMGR_REF_ID_TRACE
-qdf_list_t *wlan_objmgr_populate_logically_deleted_peerlist_by_mac_n_vdev_debug(
-			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
-			uint8_t *bssid, uint8_t *macaddr,
-			wlan_objmgr_ref_dbgid dbg_id,
-			const char *func, int line);
-
-#define wlan_objmgr_populate_logically_deleted_peerlist_by_mac_n_vdev( \
-	psoc, pdev_id, bssid, macaddr, dbgid) \
-		wlan_objmgr_populate_logically_deleted_peerlist_by_mac_n_vdev_debug( \
-		psoc, pdev_id, bssid, macaddr, dbgid, __func__, __LINE__)
-#else
 qdf_list_t *wlan_objmgr_populate_logically_deleted_peerlist_by_mac_n_vdev(
 			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
 			uint8_t *bssid, uint8_t *macaddr,
@@ -834,16 +857,16 @@ qdf_list_t *wlan_objmgr_populate_logically_deleted_peerlist_by_mac_n_vdev(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_peer_by_mac_n_vdev(psoc, pdev_id, bssid, macaddr, \
+	dbg_id) \
+		wlan_objmgr_get_peer_by_mac_n_vdev_debug(psoc, pdev_id, \
+		bssid, macaddr, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_by_mac_n_vdev_debug(
 			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
 			uint8_t *bssid, uint8_t *macaddr,
 			wlan_objmgr_ref_dbgid dbg_id,
 			const char *func, int line);
-
-#define wlan_objmgr_get_peer_by_mac_n_vdev(psoc, pdevid, bssid, macaddr, \
-	dbgid) \
-		wlan_objmgr_get_peer_by_mac_n_vdev_debug(psoc, pdevid, \
-		bssid, macaddr, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_by_mac_n_vdev(
 			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
@@ -871,16 +894,16 @@ struct wlan_objmgr_peer *wlan_objmgr_get_peer_by_mac_n_vdev(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_peer_by_mac_n_vdev_no_state(psoc, pdev_id, bssid, \
+	macaddr, dbg_id) \
+		wlan_objmgr_get_peer_by_mac_n_vdev_no_state_debug(psoc, \
+		pdev_id, bssid, macaddr, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_by_mac_n_vdev_no_state_debug(
 			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
 			uint8_t *bssid,  uint8_t *macaddr,
 			wlan_objmgr_ref_dbgid dbg_id,
 			const char *func, int line);
-
-#define wlan_objmgr_get_peer_by_mac_n_vdev_no_state(psoc, pdevid, bssid, \
-	macaddr, dbgid) \
-		wlan_objmgr_get_peer_by_mac_n_vdev_no_state_debug(psoc, \
-		pdevid, bssid, macaddr, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_peer *wlan_objmgr_get_peer_by_mac_n_vdev_no_state(
 			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
@@ -980,15 +1003,15 @@ struct wlan_objmgr_pdev *wlan_objmgr_get_pdev_by_macaddr_no_state(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_vdev_by_opmode_from_psoc(psoc, opmode, dbg_id) \
+		wlan_objmgr_get_vdev_by_opmode_from_psoc_debug(psoc, opmode, \
+		dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_opmode_from_psoc_debug(
 			struct wlan_objmgr_psoc *psoc,
 			enum QDF_OPMODE opmode,
 			wlan_objmgr_ref_dbgid dbg_id,
 			const char *func, int line);
-
-#define wlan_objmgr_get_vdev_by_opmode_from_psoc(psoc, opmode, dbgid) \
-		wlan_objmgr_get_vdev_by_opmode_from_psoc_debug(psoc, opmode, \
-		dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_opmode_from_psoc(
 			struct wlan_objmgr_psoc *psoc,
@@ -999,7 +1022,7 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_opmode_from_psoc(
 /**
  * wlan_objmgr_get_vdev_by_id_from_psoc() - retrieve vdev by id
  * @psoc: PSOC object
- * @id: vdev id
+ * @vdev_id: vdev id
  * @dbg_id: id of the caller
  *
  * API to find vdev object pointer by vdev id from psoc
@@ -1012,14 +1035,14 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_opmode_from_psoc(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id, dbg_id) \
+		wlan_objmgr_get_vdev_by_id_from_psoc_debug(psoc, vdev_id, \
+		dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_psoc_debug(
 			struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
 			wlan_objmgr_ref_dbgid dbg_id,
 			const char *func, int line);
-
-#define wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id, dbgid) \
-		wlan_objmgr_get_vdev_by_id_from_psoc_debug(psoc, vdev_id, \
-		dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_psoc(
 			struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
@@ -1029,7 +1052,7 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_psoc(
 /**
  * wlan_objmgr_get_vdev_by_id_from_psoc_no_state() - retrieve vdev by id
  * @psoc: PSOC object
- * @id: vdev id
+ * @vdev_id: vdev id
  * @dbg_id: id of the caller
  *
  * API to find vdev object pointer by vdev id from psoc, ignores the
@@ -1043,14 +1066,14 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_psoc(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_vdev_by_id_from_psoc_no_state(psoc, vdev_id, dbg_id) \
+		wlan_objmgr_get_vdev_by_id_from_psoc_no_state_debug(psoc, \
+		vdev_id, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_psoc_no_state_debug(
 			struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
 			wlan_objmgr_ref_dbgid dbg_id,
 			const char *func, int line);
-
-#define wlan_objmgr_get_vdev_by_id_from_psoc_no_state(psoc, vdev_id, dbgid) \
-		wlan_objmgr_get_vdev_by_id_from_psoc_no_state_debug(psoc, \
-		vdev_id, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_psoc_no_state(
 			struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
@@ -1060,7 +1083,7 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_psoc_no_state(
 /**
  * wlan_objmgr_get_vdev_by_id_from_psoc_not_log_del() - retrieve vdev by id
  * @psoc: PSOC object
- * @id: vdev id
+ * @vdev_id: vdev id
  * @dbg_id: id of the caller
  *
  * API to find vdev object pointer by vdev id from psoc, ignores the
@@ -1074,14 +1097,14 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_psoc_no_state(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_vdev_by_id_from_psoc_not_log_del(psoc, vdev_id, dbg_id) \
+		wlan_objmgr_get_vdev_by_id_from_psoc_not_log_del_debug(psoc, \
+		vdev_id, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_psoc_not_log_del_debug(
 			struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
 			wlan_objmgr_ref_dbgid dbg_id,
 			const char *func, int line);
-
-#define wlan_objmgr_get_vdev_by_id_from_psoc_not_log_del(psoc, vdev_id, dbgid) \
-		wlan_objmgr_get_vdev_by_id_from_psoc_not_log_del_debug(psoc, \
-		vdev_id, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_psoc_not_log_del(
 			struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
@@ -1105,15 +1128,15 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_psoc_not_log_del(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_vdev_by_macaddr_from_psoc(psoc, pdev_id, macaddr, \
+	dbg_id) \
+		wlan_objmgr_get_vdev_by_macaddr_from_psoc_debug(psoc, pdev_id, \
+		macaddr, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_psoc_debug(
 		struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
 		const uint8_t *macaddr, wlan_objmgr_ref_dbgid dbg_id,
 		const char *func, int line);
-
-#define wlan_objmgr_get_vdev_by_macaddr_from_psoc(psoc, pdev_id, macaddr, \
-	dbgid) \
-		wlan_objmgr_get_vdev_by_macaddr_from_psoc_debug(psoc, pdev_id, \
-		macaddr, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_psoc(
 		struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
@@ -1139,16 +1162,16 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_psoc(
  *         NULL on FAILURE
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_get_vdev_by_macaddr_from_psoc_no_state(psoc, pdev_id, \
+	macaddr, dbg_id) \
+		wlan_objmgr_get_vdev_by_macaddr_from_psoc_no_state_debug(psoc, \
+		pdev_id, macaddr, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_vdev
 	*wlan_objmgr_get_vdev_by_macaddr_from_psoc_no_state_debug(
 		struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
 		const uint8_t *macaddr, wlan_objmgr_ref_dbgid dbg_id,
 		const char *func, int line);
-
-#define wlan_objmgr_get_vdev_by_macaddr_from_psoc_no_state(psoc, pdev_id, \
-	macaddr, dbgid) \
-		wlan_objmgr_get_vdev_by_macaddr_from_psoc_no_state_debug(psoc, \
-		pdev_id, macaddr, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_psoc_no_state(
 		struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,
@@ -1387,7 +1410,7 @@ wlan_psoc_nif_fw_ext2_cap_get(struct wlan_objmgr_psoc *psoc, uint32_t ext2_cap)
 /**
  * wlan_psoc_nif_feat_cap_set() - set feature caps
  * @psoc: PSOC object
- * @cap: feature flag to be set
+ * @feat_cap: feature flag to be set
  *
  * API to set feature caps in psoc
  *
@@ -1402,7 +1425,7 @@ static inline void wlan_psoc_nif_feat_cap_set(struct wlan_objmgr_psoc *psoc,
 /**
  * wlan_psoc_nif_feat_cap_clear() - clear feature caps
  * @psoc: PSOC object
- * @cap: feature flag to be cleared
+ * @feat_cap: feature flag to be cleared
  *
  * API to clear feature caps in psoc
  *
@@ -1417,7 +1440,7 @@ static inline void wlan_psoc_nif_feat_cap_clear(struct wlan_objmgr_psoc *psoc,
 /**
  * wlan_psoc_nif_feat_cap_get() - get feature caps
  * @psoc: PSOC object
- * @cap: feature flag to be checked
+ * @feat_cap: feature flag to be checked
  *
  * API to know, whether particular feature cap flag is set in psoc
  *
@@ -1576,15 +1599,15 @@ struct wlan_lmac_if_tx_ops *wlan_psoc_get_lmac_if_txops(struct wlan_objmgr_psoc
 /**
  * wlan_psoc_set_lmac_if_rxops() - API to set rx ops handle in psoc object
  * @psoc: Psoc pointer
- * @tgt_if_handle: rx callbacks handle
+ * @rx_ops: rx callbacks handle
  *
  * API to set rx callbacks handle in psoc object
  *
  * Return: None
  */
 static inline
-void wlan_psoc_set_lmac_if_rxops(struct wlan_objmgr_psoc *psoc, struct
-		wlan_lmac_if_rx_ops *rx_ops)
+void wlan_psoc_set_lmac_if_rxops(struct wlan_objmgr_psoc *psoc,
+				 struct	wlan_lmac_if_rx_ops *rx_ops)
 {
 	if (!psoc)
 		return;
@@ -1666,7 +1689,7 @@ static inline qdf_device_t wlan_psoc_get_qdf_dev(
 /**
  * wlan_psoc_set_qdf_dev() - API to get qdf device
  * @psoc: Psoc pointer
- * dev: qdf device
+ * @dev: qdf device
  *
  * API to set qdf device from psoc object
  *
@@ -1685,7 +1708,7 @@ static inline void wlan_psoc_set_qdf_dev(
 /**
  * wlan_psoc_set_max_vdev_count() - set psoc max vdev count
  * @psoc: PSOC object
- * @vdev count: Max vdev count
+ * @max_vdev_count: Max vdev count
  *
  * API to set Max vdev count
  *
@@ -1717,7 +1740,7 @@ static inline uint8_t wlan_psoc_get_max_vdev_count(
 /**
  * wlan_psoc_set_max_peer_count() - set psoc max peer count
  * @psoc: PSOC object
- * @peer count: Max peer count
+ * @max_peer_count: Max peer count
  *
  * API to set Max peer count
  *

umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 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
@@ -273,9 +273,9 @@
  * @flags:          create flags
  * @size_vdev_priv: Size of vdev private
  * @legacy_osif:    Legacy os_if private member
- * @macaddr[]:      MAC address
- * @mataddr[]:      MAT address
- * @mldaddr[]:      MLD address
+ * @macaddr:        MAC address
+ * @mataddr:        MAT address
+ * @mldaddr:        MLD address
  */
 struct wlan_vdev_create_params {
 	enum QDF_OPMODE opmode;
@@ -323,7 +323,7 @@ struct wlan_channel {
  * struct wlan_objmgr_vdev_mlme - VDEV MLME specific sub structure
  * @vdev_opmode:        Opmode of VDEV
  * @mlme_state:         VDEV MLME SM state
- * @mlme_state:         VDEV MLME SM substate
+ * @mlme_substate:      VDEV MLME SM substate
  * @bss_chan:           BSS channel
  * @des_chan:           Desired channel, for STA Desired may not be used
  * @vdev_caps:          VDEV capabilities
@@ -331,11 +331,11 @@ struct wlan_channel {
  * @vdev_feat_ext_caps: VDEV Extended feature caps
  * @vdev_feat_ext2_caps: More VDEV Extended feature caps
  * @vdev_op_flags:      Operation flags
- * @mataddr[]:          MAT address
- * @macaddr[]:          Contains link MAC address for ML connection and
+ * @mataddr:            MAT address
+ * @macaddr:            Contains link MAC address for ML connection and
  *                      net dev address for non-ML connection
- * @mldaddr[]:          MLD address
- * @linkaddr[]:         Link MAC address
+ * @mldaddr:            MLD address
+ * @linkaddr:           Link MAC address
  * @mlo_link_id: link id for mlo connection
  * @wlan_vdev_mlo_lock: lock to protect the set/clear of
  * WLAN_VDEV_FEXT2_MLO feature flag in vdev MLME
@@ -386,7 +386,7 @@ struct wlan_objmgr_vdev_nif {
  *  @c_flags:           creation specific flags
  *  @ref_cnt:           Ref count
  *  @ref_id_dbg:        Array to track Ref count
- *  @wlan_objmgr_trace: Trace ref and deref
+ *  @trace:             Trace ref and deref
  */
 struct wlan_objmgr_vdev_objmgr {
 	uint8_t vdev_id;
@@ -411,8 +411,8 @@ struct wlan_objmgr_vdev_objmgr {
  * @vdev_mlme:      VDEV MLME substructure
  * @vdev_objmgr:    VDEV Object Mgr substructure
  * @vdev_nif:       VDEV HDD substructure
- * @vdev_comp_priv_obj[]:Component's private objects list
- * @obj_status[]:   Component object status
+ * @vdev_comp_priv_obj:Component's private objects list
+ * @obj_status:     Component object status
  * @obj_state:      VDEV object state
  * @vdev_lock:      VDEV lock
  * @mlo_dev_ctx:    MLO device context
@@ -435,8 +435,8 @@ struct wlan_objmgr_vdev {
 #endif
 };
 
-/**
- ** APIs to Create/Delete Global object APIs
+/*
+ * APIs to Create/Delete Global object APIs
  */
 /**
  * wlan_objmgr_vdev_obj_create() - vdev object create
@@ -467,8 +467,8 @@ struct wlan_objmgr_vdev *wlan_objmgr_vdev_obj_create(
  */
 QDF_STATUS wlan_objmgr_vdev_obj_delete(struct wlan_objmgr_vdev *vdev);
 
-/**
- ** APIs to attach/detach component objects
+/*
+ * APIs to attach/detach component objects
  */
 /**
  * wlan_objmgr_vdev_component_obj_attach() - vdev comp object attach
@@ -504,9 +504,10 @@ QDF_STATUS wlan_objmgr_vdev_component_obj_detach(
 		struct wlan_objmgr_vdev *vdev,
 		enum wlan_umac_comp_id id,
 		void *comp_priv_obj);
+
 /*
- ** APIs to operations on vdev objects
-*/
+ * APIs to operations on vdev objects
+ */
 
 typedef void (*wlan_objmgr_vdev_op_handler)(struct wlan_objmgr_vdev *vdev,
 					void *object,
@@ -613,14 +614,13 @@ static inline struct wlan_objmgr_pdev *wlan_vdev_get_pdev(
 
 /**
  * wlan_pdev_vdev_list_peek_head() - get first vdev from pdev list
- * @peer_list: qdf_list_t
+ * @vdev_list: qdf_list_t
  *
  * API to get the head vdev of given vdev (of pdev's vdev list)
  *
  * Caller need to acquire lock with wlan_vdev_obj_lock()
  *
- * Return:
- * @peer: head peer
+ * Return: head peer
  */
 static inline struct wlan_objmgr_vdev *wlan_pdev_vdev_list_peek_head(
 					qdf_list_t *vdev_list)
@@ -639,14 +639,14 @@ static inline struct wlan_objmgr_vdev *wlan_pdev_vdev_list_peek_head(
 
 /**
  * wlan_vdev_get_next_vdev_of_pdev() - get next vdev
+ * @vdev_list: qdf_list_t
  * @vdev: VDEV object
  *
  * API to get next vdev object pointer of vdev
  *
  * Caller need to acquire lock with wlan_vdev_obj_lock()
  *
- * Return:
- * @vdev_next: VDEV object
+ * Return: VDEV object
  */
 static inline struct wlan_objmgr_vdev *wlan_vdev_get_next_vdev_of_pdev(
 					qdf_list_t *vdev_list,
@@ -718,7 +718,7 @@ static inline struct wlan_objmgr_psoc *wlan_vdev_get_psoc(
  *
  * API to get VDEV's psoc id
  *
- * Return: @psoc_id: psoc id
+ * Return: psoc id
  */
 static inline uint8_t wlan_vdev_get_psoc_id(struct wlan_objmgr_vdev *vdev)
 {
@@ -750,8 +750,7 @@ static inline void wlan_vdev_mlme_set_opmode(struct wlan_objmgr_vdev *vdev,
  *
  * API to set opmode of vdev object
  *
- * Return:
- * @mode: VDEV op mode
+ * Return: VDEV op mode
  */
 static inline enum QDF_OPMODE wlan_vdev_mlme_get_opmode(
 					struct wlan_objmgr_vdev *vdev)
@@ -785,8 +784,7 @@ static inline void wlan_vdev_mlme_set_macaddr(struct wlan_objmgr_vdev *vdev,
  *
  * Caller need to acquire lock with wlan_vdev_obj_lock()
  *
- * Return:
- * @macaddr: MAC address
+ * Return: MAC address
  */
 static inline uint8_t *wlan_vdev_mlme_get_macaddr(struct wlan_objmgr_vdev *vdev)
 {
@@ -820,8 +818,7 @@ static inline void wlan_vdev_mlme_set_mataddr(struct wlan_objmgr_vdev *vdev,
  *
  * Caller need to acquire lock with wlan_vdev_obj_lock()
  *
- * Return:
- * @macaddr: MAC address
+ * Return: MAC address
  */
 static inline uint8_t *wlan_vdev_mlme_get_mldaddr(struct wlan_objmgr_vdev *vdev)
 {
@@ -855,8 +852,7 @@ static inline void wlan_vdev_mlme_set_mldaddr(struct wlan_objmgr_vdev *vdev,
  *
  * Caller need to acquire lock with wlan_vdev_obj_lock()
  *
- * Return:
- * @linkaddr: Link MAC address
+ * Return: Link MAC address
  */
 static inline
 uint8_t *wlan_vdev_mlme_get_linkaddr(struct wlan_objmgr_vdev *vdev)
@@ -892,8 +888,7 @@ static inline void wlan_vdev_mlme_set_linkaddr(struct wlan_objmgr_vdev *vdev,
  *
  * Caller need to acquire lock with wlan_vdev_obj_lock()
  *
- * Return:
- * @mataddr: MAT address
+ * Return: MAT address
  */
 static inline uint8_t *wlan_vdev_mlme_get_mataddr(struct wlan_objmgr_vdev *vdev)
 {
@@ -907,8 +902,7 @@ static inline uint8_t *wlan_vdev_mlme_get_mataddr(struct wlan_objmgr_vdev *vdev)
  *
  * API to get vdev id
  *
- * Return:
- * @id: vdev id
+ * Return: vdev id
  */
 static inline uint8_t wlan_vdev_get_id(struct wlan_objmgr_vdev *vdev)
 {
@@ -1070,8 +1064,7 @@ void wlan_destroy_vdev_mlo_lock(struct wlan_objmgr_vdev *vdev)
  *
  * Caller need to acquire lock with wlan_vdev_obj_lock()
  *
- * Return:
- * @macaddr: HW MAC address
+ * Return: HW MAC address
  */
 static inline uint8_t *wlan_vdev_get_hw_macaddr(struct wlan_objmgr_vdev *vdev)
 {
@@ -1135,8 +1128,7 @@ static inline void wlan_vdev_mlme_set_bss_chan(
  *
  * API to get the BSS channel
  *
- * Return:
- * @bss_chan: Channel
+ * Return: Channel
  */
 static inline struct wlan_channel *wlan_vdev_mlme_get_bss_chan(
 				struct wlan_objmgr_vdev *vdev)
@@ -1166,8 +1158,7 @@ static inline void wlan_vdev_mlme_set_des_chan(
  *
  * API to get the desired channel
  *
- * Return:
- * @des_chan: Channel configured by user
+ * Return: Channel configured by user
  */
 static inline struct wlan_channel *wlan_vdev_mlme_get_des_chan(
 				struct wlan_objmgr_vdev *vdev)
@@ -1463,8 +1454,7 @@ static inline void wlan_vdev_set_selfpeer(struct wlan_objmgr_vdev *vdev,
  *
  * API to get the self peer of VDEV
  *
- * Return:
- * @peer: peer pointer
+ * Return: peer pointer
  */
 static inline struct wlan_objmgr_peer *wlan_vdev_get_selfpeer(
 					struct wlan_objmgr_vdev *vdev)
@@ -1495,8 +1485,7 @@ static inline void wlan_vdev_set_bsspeer(struct wlan_objmgr_vdev *vdev,
  * preferred to use outside obj manager to take and handle ref count of
  * bss_peer with ref debug ID.
  *
- * Return:
- * @peer: BSS peer pointer
+ * Return: BSS peer pointer
  */
 static inline struct wlan_objmgr_peer *wlan_vdev_get_bsspeer(
 					struct wlan_objmgr_vdev *vdev)
@@ -1512,8 +1501,7 @@ static inline struct wlan_objmgr_peer *wlan_vdev_get_bsspeer(
  *
  * API to get and increment ref count of BSS peer of VDEV
  *
- * Return:
- * @peer: peer pointer to the peer of the mac address
+ * Return: peer pointer to the peer of the mac address
  */
 struct wlan_objmgr_peer *
 wlan_objmgr_vdev_find_peer_by_mac(struct wlan_objmgr_vdev *vdev,
@@ -1528,8 +1516,7 @@ wlan_objmgr_vdev_find_peer_by_mac(struct wlan_objmgr_vdev *vdev,
  *
  * API to get and increment ref count of BSS peer of VDEV
  *
- * Return:
- * @peer: BSS peer pointer if bss peer is present and valid else NULL
+ * Return: BSS peer pointer if bss peer is present and valid else NULL
  */
 struct wlan_objmgr_peer *wlan_objmgr_vdev_try_get_bsspeer(
 					struct wlan_objmgr_vdev *vdev,
@@ -1802,12 +1789,12 @@ bool wlan_vdev_mlme_is_link_sta_vdev(struct wlan_objmgr_vdev *vdev)
  * Return: void
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_vdev_get_ref(vdev, id) \
+		wlan_objmgr_vdev_get_ref_debug(vdev, id, __func__, __LINE__)
+
 void wlan_objmgr_vdev_get_ref_debug(struct wlan_objmgr_vdev *vdev,
 				    wlan_objmgr_ref_dbgid id,
 				    const char *func, int line);
-
-#define wlan_objmgr_vdev_get_ref(vdev, dbgid) \
-		wlan_objmgr_vdev_get_ref_debug(vdev, dbgid, __func__, __LINE__)
 #else
 void wlan_objmgr_vdev_get_ref(struct wlan_objmgr_vdev *vdev,
 				wlan_objmgr_ref_dbgid id);
@@ -1823,13 +1810,13 @@ void wlan_objmgr_vdev_get_ref(struct wlan_objmgr_vdev *vdev,
  * Return: void
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_vdev_try_get_ref(vdev, id) \
+		wlan_objmgr_vdev_try_get_ref_debug(vdev, id, \
+		__func__, __LINE__)
+
 QDF_STATUS wlan_objmgr_vdev_try_get_ref_debug(struct wlan_objmgr_vdev *vdev,
 					      wlan_objmgr_ref_dbgid id,
 					      const char *func, int line);
-
-#define wlan_objmgr_vdev_try_get_ref(vdev, dbgid) \
-		wlan_objmgr_vdev_try_get_ref_debug(vdev, dbgid, \
-		__func__, __LINE__)
 #else
 QDF_STATUS wlan_objmgr_vdev_try_get_ref(struct wlan_objmgr_vdev *vdev,
 						wlan_objmgr_ref_dbgid id);
@@ -1846,13 +1833,13 @@ QDF_STATUS wlan_objmgr_vdev_try_get_ref(struct wlan_objmgr_vdev *vdev,
  * Return: void
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_objmgr_vdev_release_ref(vdev, id)\
+		wlan_objmgr_vdev_release_ref_debug(vdev, id, \
+		__func__, __LINE__)
+
 void wlan_objmgr_vdev_release_ref_debug(struct wlan_objmgr_vdev *vdev,
 					wlan_objmgr_ref_dbgid id,
 					const char *func, int line);
-
-#define wlan_objmgr_vdev_release_ref(vdev, dbgid)\
-		wlan_objmgr_vdev_release_ref_debug(vdev, dbgid, \
-		__func__, __LINE__)
 #else
 void wlan_objmgr_vdev_release_ref(struct wlan_objmgr_vdev *vdev,
 						wlan_objmgr_ref_dbgid id);
@@ -1867,20 +1854,19 @@ void wlan_objmgr_vdev_release_ref(struct wlan_objmgr_vdev *vdev,
  *
  * API to get next active vdev object pointer of vdev
  *
- * Return:
- * @vdev_next: VDEV object
+ * Return: VDEV object
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_vdev_get_next_active_vdev_of_pdev(pdev, vdev_list, vdev, dbg_id) \
+		wlan_vdev_get_next_active_vdev_of_pdev_debug(pdev, vdev_list, \
+		vdev, dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_vdev *wlan_vdev_get_next_active_vdev_of_pdev_debug(
 					struct wlan_objmgr_pdev *pdev,
 					qdf_list_t *vdev_list,
 					struct wlan_objmgr_vdev *vdev,
 					wlan_objmgr_ref_dbgid dbg_id,
 					const char *func, int line);
-
-#define wlan_vdev_get_next_active_vdev_of_pdev(pdev, vdev_list, vdev, dbgid) \
-		wlan_vdev_get_next_active_vdev_of_pdev_debug(pdev, vdev_list, \
-		vdev, dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_vdev_get_next_active_vdev_of_pdev(
 					struct wlan_objmgr_pdev *pdev,
@@ -1899,14 +1885,14 @@ struct wlan_objmgr_vdev *wlan_vdev_get_next_active_vdev_of_pdev(
  * Return:
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_pdev_peek_active_first_vdev(pdev, dbg_id) \
+		wlan_pdev_peek_active_first_vdev_debug(pdev, dbg_id, \
+		__func__, __LINE__)
+
 struct wlan_objmgr_vdev *wlan_pdev_peek_active_first_vdev_debug(
 		struct wlan_objmgr_pdev *pdev,
 		wlan_objmgr_ref_dbgid dbg_id,
 		const char *func, int line);
-
-#define wlan_pdev_peek_active_first_vdev(pdev, dbgid) \
-		wlan_pdev_peek_active_first_vdev_debug(pdev, dbgid, \
-		__func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_pdev_peek_active_first_vdev(
 		struct wlan_objmgr_pdev *pdev,
@@ -1915,25 +1901,24 @@ struct wlan_objmgr_vdev *wlan_pdev_peek_active_first_vdev(
 
 /**
  * wlan_pdev_vdev_list_peek_active_head() - get first active vdev from pdev list
- * @vdev: VDEV object
+ * @pdev: PDEV object
  * @vdev_list: qdf_list_t
  * @dbg_id: id of the caller
  *
  * API to get the head active vdev of given vdev (of pdev's vdev list)
  *
- * Return:
- * @peer: head peer
+ * Return: head peer
  */
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
+#define wlan_pdev_vdev_list_peek_active_head(pdev, vdev_list, dbg_id) \
+		wlan_pdev_vdev_list_peek_active_head_debug(pdev, vdev_list, \
+		dbg_id, __func__, __LINE__)
+
 struct wlan_objmgr_vdev *wlan_pdev_vdev_list_peek_active_head_debug(
 				struct wlan_objmgr_pdev *pdev,
 				qdf_list_t *vdev_list,
 				wlan_objmgr_ref_dbgid dbg_id,
 				const char *func, int line);
-
-#define wlan_pdev_vdev_list_peek_active_head(pdev, vdev_list, dbgid) \
-		wlan_pdev_vdev_list_peek_active_head_debug(pdev, vdev_list, \
-		dbgid, __func__, __LINE__)
 #else
 struct wlan_objmgr_vdev *wlan_pdev_vdev_list_peek_active_head(
 				struct wlan_objmgr_pdev *pdev,

umac/cmn_services/obj_mgr/src/wlan_objmgr_global_obj.c

@@ -16,9 +16,10 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
- /**
-  * DOC: Public APIs to perform operations on Global objects
-  */
+
+/**
+ * DOC: Public APIs to perform operations on Global objects
+ */
 
 #include "wlan_objmgr_global_obj_i.h"
 #include <wlan_objmgr_global_obj.h>
@@ -33,8 +34,8 @@ struct wlan_objmgr_global *g_umac_glb_obj;
 qdf_export_symbol(g_umac_glb_obj);
 
 /*
-** APIs to Create/Delete Global object APIs
-*/
+ * APIs to Create/Delete Global object APIs
+ */
 QDF_STATUS wlan_objmgr_global_obj_init(void)
 {
 	struct wlan_objmgr_global *umac_global_obj;
@@ -84,8 +85,8 @@ QDF_STATUS wlan_objmgr_global_obj_deinit(void)
 }
 qdf_export_symbol(wlan_objmgr_global_obj_deinit);
 
-/**
- ** APIs to register/unregister handlers
+/*
+ * APIs to register/unregister handlers
  */
 QDF_STATUS wlan_objmgr_register_psoc_create_handler(
 		enum wlan_umac_comp_id id,

umac/cmn_services/obj_mgr/src/wlan_objmgr_global_obj_i.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016-2019, 2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 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
@@ -15,9 +16,10 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
- /**
-  * DOC: Define the global data structure of UMAC
-  */
+
+/**
+ * DOC: Define the global data structure of UMAC
+ */
 #ifndef _WLAN_OBJMGR_GLOBAL_OBJ_I_H_
 #define _WLAN_OBJMGR_GLOBAL_OBJ_I_H_
 
@@ -28,36 +30,37 @@
 
 struct wlan_objmgr_debug_info;
 /**
- *  struct wlan_objmgr_global - Global object definition
- *  @psoc[]:                    Array of PSOCs to maintain PSOC's list,
- *                              its optional
- *  @psoc_create_handler[]:     PSOC create handler array
- *  @psoc_create_handler_arg[]: PSOC create handler args array
- *  @psoc_destroy_handler[]:     PSOC destroy handler array
- *  @psoc_destroy_handler_arg[]: PSOC destroy handler args array
- *  @psoc_status_handler[]:     PSOC status handler array
- *  @psoc_status_handler_arg[]: PSOC status handler args array
- *  @pdev_create_handler[]:     PDEV create handler array
- *  @pdev_create_handler_arg[]: PDEV create handler args array
- *  @pdev_destroy_handler[]:     PDEV destroy handler array
- *  @pdev_destroy_handler_arg[]: PDEV destroy handler args array
- *  @pdev_status_handler[]:     PDEV status handler array
- *  @pdev_status_handler_arg[]: PDEV status handler args array
- *  @vdev_create_handler[]:     VDEV create handler array
- *  @vdev_create_handler_arg[]: VDEV create handler args array
- *  @vdev_destroy_handler[]:     VDEV destroy handler array
- *  @vdev_destroy_handler_arg[]: VDEV destroy handler args array
- *  @vdev_peer_free_notify_handler[]: VDEV peer free notify handler array
- *  @vdev_status_handler[]:     VDEV status handler array
- *  @vdev_status_handler_arg[]: VDEV status handler args array
- *  @peer_create_handler[]:     PEER create handler array
- *  @peer_create_handler_arg[]: PEER create handler args array
- *  @peer_destroy_handler[]:     PEER destroy handler array
- *  @peer_destroy_handler_arg[]: PEER destroy handler args array
- *  @peer_status_handler[]:     PEER status handler array
- *  @peer_status_handler_arg[]: PEER status handler args array
- *  @debug_info:                Objmgr debug information
- *  @global_lock:               Global lock
+ * struct wlan_objmgr_global - Global object definition
+ * @psoc:                      Array of PSOCs to maintain PSOC's list,
+ *                             its optional
+ * @mlo_ctx:                   MLO manager global context
+ * @psoc_create_handler:       PSOC create handler array
+ * @psoc_create_handler_arg:   PSOC create handler args array
+ * @psoc_destroy_handler:      PSOC destroy handler array
+ * @psoc_destroy_handler_arg:  PSOC destroy handler args array
+ * @psoc_status_handler:       PSOC status handler array
+ * @psoc_status_handler_arg:   PSOC status handler args array
+ * @pdev_create_handler:       PDEV create handler array
+ * @pdev_create_handler_arg:   PDEV create handler args array
+ * @pdev_destroy_handler:      PDEV destroy handler array
+ * @pdev_destroy_handler_arg:  PDEV destroy handler args array
+ * @pdev_status_handler:       PDEV status handler array
+ * @pdev_status_handler_arg:   PDEV status handler args array
+ * @vdev_create_handler:       VDEV create handler array
+ * @vdev_create_handler_arg:   VDEV create handler args array
+ * @vdev_destroy_handler:      VDEV destroy handler array
+ * @vdev_destroy_handler_arg:  VDEV destroy handler args array
+ * @vdev_peer_free_notify_handler: VDEV peer free notify handler array
+ * @vdev_status_handler:       VDEV status handler array
+ * @vdev_status_handler_arg:   VDEV status handler args array
+ * @peer_create_handler:       PEER create handler array
+ * @peer_create_handler_arg:   PEER create handler args array
+ * @peer_destroy_handler:      PEER destroy handler array
+ * @peer_destroy_handler_arg:  PEER destroy handler args array
+ * @peer_status_handler:       PEER status handler array
+ * @peer_status_handler_arg:   PEER status handler args array
+ * @debug_info:                Objmgr debug information
+ * @global_lock:               Global lock
  */
 struct wlan_objmgr_global {
 	struct wlan_objmgr_psoc *psoc[WLAN_OBJMGR_MAX_DEVICES];
@@ -112,7 +115,7 @@ extern struct wlan_objmgr_global *g_umac_glb_obj;
 
 /**
  * wlan_objmgr_psoc_object_attach() - attach psoc to global object
- * @psoc - PSOC object
+ * @psoc: PSOC object
  *
  * attaches PSOC to global psoc list
  *
@@ -124,7 +127,7 @@ QDF_STATUS wlan_objmgr_psoc_object_attach(
 
 /**
  * wlan_objmgr_psoc_object_detach() - detach psoc from global object
- * @psoc - PSOC object
+ * @psoc: PSOC object
  *
  * detaches PSOC from global psoc list
  *
@@ -136,10 +139,10 @@ QDF_STATUS wlan_objmgr_psoc_object_detach(
 
 /**
  * wlan_objmgr_print_ref_ids() - Print ref counts of modules
- * @id - array of ref debug
- * @log_level - log level
+ * @id: array of ref debug
+ * @log_level: log level
  *
- * Itertes through array, and prints the ref count debug
+ * Iterates through array, and prints the ref count debug
  *
  * Return: nothing
  */

umac/cmn_services/obj_mgr/src/wlan_objmgr_pdev_obj.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 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
@@ -33,8 +33,8 @@
 #include "wlan_objmgr_pdev_obj_i.h"
 #include <wlan_utility.h>
 
-/**
- ** APIs to Create/Delete Global object APIs
+/*
+ * APIs to Create/Delete Global object APIs
  */
 static QDF_STATUS wlan_objmgr_pdev_object_status(
 		struct wlan_objmgr_pdev *pdev)
@@ -274,8 +274,8 @@ QDF_STATUS wlan_objmgr_pdev_obj_delete(struct wlan_objmgr_pdev *pdev)
 }
 qdf_export_symbol(wlan_objmgr_pdev_obj_delete);
 
-/**
- ** APIs to attach/detach component objects
+/*
+ * APIs to attach/detach component objects
  */
 QDF_STATUS wlan_objmgr_pdev_component_obj_attach(
 		struct wlan_objmgr_pdev *pdev,
@@ -308,7 +308,7 @@ QDF_STATUS wlan_objmgr_pdev_component_obj_attach(
 
 	if (pdev->obj_state != WLAN_OBJ_STATE_PARTIALLY_CREATED)
 		return QDF_STATUS_SUCCESS;
-	/**
+	/*
 	 * If PDEV object status is partially created means, this API is
 	 * invoked with different context, this block should be executed for
 	 * async components only
@@ -405,8 +405,8 @@ QDF_STATUS wlan_objmgr_pdev_component_obj_detach(
 }
 qdf_export_symbol(wlan_objmgr_pdev_component_obj_detach);
 
-/**
- ** APIs to operations on pdev objects
+/*
+ * APIs to operations on pdev objects
  */
 static void wlan_objmgr_pdev_vdev_iterate_peers(struct wlan_objmgr_pdev *pdev,
 				struct wlan_objmgr_vdev *vdev,
@@ -837,7 +837,7 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_pdev_debug(
 	vdev_list = &objmgr->wlan_vdev_list;
 	/* Get first vdev */
 	vdev = wlan_pdev_vdev_list_peek_head(vdev_list);
-	/**
+	/*
 	 * Iterate through pdev's vdev list, till vdev id matches with
 	 * entry of vdev list
 	 */
@@ -876,7 +876,7 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_pdev(
 	vdev_list = &objmgr->wlan_vdev_list;
 	/* Get first vdev */
 	vdev = wlan_pdev_vdev_list_peek_head(vdev_list);
-	/**
+	/*
 	 * Iterate through pdev's vdev list, till vdev id matches with
 	 * entry of vdev list
 	 */
@@ -917,7 +917,7 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_pdev_no_state_debug(
 	vdev_list = &objmgr->wlan_vdev_list;
 	/* Get first vdev */
 	vdev = wlan_pdev_vdev_list_peek_head(vdev_list);
-	/**
+	/*
 	 * Iterate through pdev's vdev list, till vdev id matches with
 	 * entry of vdev list
 	 */
@@ -955,7 +955,7 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_id_from_pdev_no_state(
 	vdev_list = &objmgr->wlan_vdev_list;
 	/* Get first vdev */
 	vdev = wlan_pdev_vdev_list_peek_head(vdev_list);
-	/**
+	/*
 	 * Iterate through pdev's vdev list, till vdev id matches with
 	 * entry of vdev list
 	 */
@@ -994,7 +994,7 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_pdev_debug(
 	vdev_list = &objmgr->wlan_vdev_list;
 	/* Get first vdev */
 	vdev = wlan_pdev_vdev_list_peek_head(vdev_list);
-	/**
+	/*
 	 * Iterate through pdev's vdev list, till vdev macaddr matches with
 	 * entry of vdev list
 	 */
@@ -1031,7 +1031,7 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_pdev(
 	vdev_list = &objmgr->wlan_vdev_list;
 	/* Get first vdev */
 	vdev = wlan_pdev_vdev_list_peek_head(vdev_list);
-	/**
+	/*
 	 * Iterate through pdev's vdev list, till vdev macaddr matches with
 	 * entry of vdev list
 	 */
@@ -1071,7 +1071,7 @@ struct wlan_objmgr_vdev
 	vdev_list = &objmgr->wlan_vdev_list;
 	/* Get first vdev */
 	vdev = wlan_pdev_vdev_list_peek_head(vdev_list);
-	/**
+	/*
 	 * Iterate through pdev's vdev list, till vdev macaddr matches with
 	 * entry of vdev list
 	 */
@@ -1107,7 +1107,7 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_pdev_no_state(
 	vdev_list = &objmgr->wlan_vdev_list;
 	/* Get first vdev */
 	vdev = wlan_pdev_vdev_list_peek_head(vdev_list);
-	/**
+	/*
 	 * Iterate through pdev's vdev list, till vdev macaddr matches with
 	 * entry of vdev list
 	 */

umac/cmn_services/obj_mgr/src/wlan_objmgr_peer_obj.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 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
@@ -16,7 +16,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
- /**
+/**
  * DOC: Public APIs to perform operations on Peer object
  */
 #include <wlan_objmgr_cmn.h>
@@ -34,8 +34,8 @@
 #include "wlan_objmgr_vdev_obj_i.h"
 
 
-/**
- ** APIs to Create/Delete Peer object APIs
+/*
+ * APIs to Create/Delete Peer object APIs
  */
 static QDF_STATUS wlan_objmgr_peer_object_status(
 		struct wlan_objmgr_peer *peer)
@@ -545,7 +545,7 @@ QDF_STATUS wlan_objmgr_peer_obj_delete(struct wlan_objmgr_peer *peer)
 
 	print_idx = qdf_get_pidx();
 	wlan_objmgr_print_peer_ref_ids(peer, QDF_TRACE_LEVEL_DEBUG);
-	/**
+	/*
 	 * Update VDEV object state to LOGICALLY DELETED
 	 * It prevents further access of this object
 	 */
@@ -558,8 +558,8 @@ QDF_STATUS wlan_objmgr_peer_obj_delete(struct wlan_objmgr_peer *peer)
 	return QDF_STATUS_SUCCESS;
 }
 qdf_export_symbol(wlan_objmgr_peer_obj_delete);
-/**
- ** APIs to attach/detach component objects
+/*
+ * APIs to attach/detach component objects
  */
 QDF_STATUS wlan_objmgr_peer_component_obj_attach(
 		struct wlan_objmgr_peer *peer,

umac/cmn_services/obj_mgr/src/wlan_objmgr_psoc_obj.c

@@ -16,9 +16,9 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
- /**
-  * DOC: Public APIs to perform operations on Global objects
-  */
+/**
+ * DOC: Public APIs to perform operations on Global objects
+ */
 
 #include <wlan_objmgr_cmn.h>
 #include <wlan_objmgr_global_obj.h>
@@ -36,8 +36,8 @@
 #include "wlan_objmgr_vdev_obj_i.h"
 #include <wlan_utility.h>
 
-/**
- ** APIs to Create/Delete Global object APIs
+/*
+ * APIs to Create/Delete Global object APIs
  */
 static QDF_STATUS wlan_objmgr_psoc_object_status(
 			struct wlan_objmgr_psoc *psoc)
@@ -1345,19 +1345,22 @@ static QDF_STATUS wlan_peer_bssid_match(struct wlan_objmgr_peer *peer,
 		return QDF_STATUS_E_FAILURE;
 }
 
+#ifdef WLAN_OBJMGR_REF_ID_TRACE
 /**
- * wlan_obj_psoc_peerlist_get_peer_by_pdev_id() - get peer from
+ * wlan_obj_psoc_peerlist_get_peer_by_pdev_id_debug() - get peer from
  *                                                      psoc peer list
- * @psoc: PSOC object
+ * @obj_list: Peer object list
  * @macaddr: MAC address
- * #pdev_id: Pdev id
+ * @pdev_id: Pdev id
+ * @dbg_id: id of the caller
+ * @func: function name
+ * @line: line number
  *
  * API to finds peer object pointer by MAC addr and pdev id from hash list
  *
  * Return: peer pointer
  *         NULL on FAILURE
  */
-#ifdef WLAN_OBJMGR_REF_ID_TRACE
 static struct wlan_objmgr_peer
 	*wlan_obj_psoc_peerlist_get_peer_by_pdev_id_debug(
 				qdf_list_t *obj_list, const uint8_t *macaddr,
@@ -1389,6 +1392,19 @@ static struct wlan_objmgr_peer
 	return NULL;
 }
 #else
+/**
+ * wlan_obj_psoc_peerlist_get_peer_by_pdev_id() - get peer from
+ *                                                      psoc peer list
+ * @obj_list: Peer object list
+ * @macaddr: MAC address
+ * @pdev_id: Pdev id
+ * @dbg_id: id of the caller
+ *
+ * API to finds peer object pointer by MAC addr and pdev id from hash list
+ *
+ * Return: peer pointer
+ *         NULL on FAILURE
+ */
 static struct wlan_objmgr_peer *wlan_obj_psoc_peerlist_get_peer_by_pdev_id(
 				qdf_list_t *obj_list, const uint8_t *macaddr,
 				uint8_t pdev_id, wlan_objmgr_ref_dbgid dbg_id)
@@ -1418,17 +1434,20 @@ static struct wlan_objmgr_peer *wlan_obj_psoc_peerlist_get_peer_by_pdev_id(
 }
 #endif
 
+#ifdef WLAN_OBJMGR_REF_ID_TRACE
 /**
- * wlan_obj_psoc_peerlist_get_peer() - get peer from psoc peer list
- * @psoc: PSOC object
+ * wlan_obj_psoc_peerlist_get_peer_debug() - get peer from psoc peer list
+ * @obj_list: Peer object list
  * @macaddr: MAC address
+ * @dbg_id: id of the caller
+ * @func: function name
+ * @line: line number
  *
  * API to finds peer object pointer by MAC addr from hash list
  *
  * Return: peer pointer
  *         NULL on FAILURE
  */
-#ifdef WLAN_OBJMGR_REF_ID_TRACE
 static struct wlan_objmgr_peer *wlan_obj_psoc_peerlist_get_peer_debug(
 		qdf_list_t *obj_list, uint8_t *macaddr,
 		wlan_objmgr_ref_dbgid dbg_id,
@@ -1458,6 +1477,17 @@ static struct wlan_objmgr_peer *wlan_obj_psoc_peerlist_get_peer_debug(
 	return NULL;
 }
 #else
+/**
+ * wlan_obj_psoc_peerlist_get_peer() - get peer from psoc peer list
+ * @obj_list: Peer object list
+ * @macaddr: MAC address
+ * @dbg_id: id of the caller
+ *
+ * API to finds peer object pointer by MAC addr from hash list
+ *
+ * Return: peer pointer
+ *         NULL on FAILURE
+ */
 static struct wlan_objmgr_peer *wlan_obj_psoc_peerlist_get_peer(
 		qdf_list_t *obj_list, uint8_t *macaddr,
 		wlan_objmgr_ref_dbgid dbg_id)
@@ -1486,18 +1516,21 @@ static struct wlan_objmgr_peer *wlan_obj_psoc_peerlist_get_peer(
 }
 #endif
 
+#ifdef WLAN_OBJMGR_REF_ID_TRACE
 /**
- * wlan_obj_psoc_peerlist_get_peer_logically_deleted() - get peer
+ * wlan_obj_psoc_peerlist_get_peer_logically_deleted_debug() - get peer
  * from psoc peer list
- * @psoc: PSOC object
+ * @obj_list: Peer object list
  * @macaddr: MAC address
+ * @dbg_id: id of the caller
+ * @func: function name
+ * @line: line number
  *
  * API to finds peer object pointer of logically deleted peer
  *
  * Return: peer pointer
  *         NULL on FAILURE
  */
-#ifdef WLAN_OBJMGR_REF_ID_TRACE
 static struct wlan_objmgr_peer *
 		wlan_obj_psoc_peerlist_get_peer_logically_deleted_debug(
 				qdf_list_t *obj_list, uint8_t *macaddr,
@@ -1532,6 +1565,18 @@ static struct wlan_objmgr_peer *
 	return NULL;
 }
 #else
+/**
+ * wlan_obj_psoc_peerlist_get_peer_logically_deleted() - get peer
+ * from psoc peer list
+ * @obj_list: Peer object list
+ * @macaddr: MAC address
+ * @dbg_id: id of the caller
+ *
+ * API to finds peer object pointer of logically deleted peer
+ *
+ * Return: peer pointer
+ *         NULL on FAILURE
+ */
 static struct wlan_objmgr_peer *
 			wlan_obj_psoc_peerlist_get_peer_logically_deleted(
 				qdf_list_t *obj_list, uint8_t *macaddr,
@@ -1644,14 +1689,19 @@ static struct wlan_objmgr_peer
 }
 #endif
 
+#ifdef WLAN_OBJMGR_REF_ID_TRACE
 /**
- * wlan_obj_psoc_peerlist_get_peer_by_mac_n_bssid() - get peer
+ * wlan_obj_psoc_peerlist_get_peer_by_mac_n_bssid_debug() - get peer
  *                                                    from psoc peer
  *                                                    list using mac and vdev
  *                                                    self mac
- * @psoc: PSOC object
+ * @obj_list: Peer object list
  * @macaddr: MAC address
  * @bssid: BSSID address
+ * @pdev_id: Pdev id
+ * @dbg_id: id of the caller
+ * @func: function name
+ * @line: line number
  *
  * API to finds peer object pointer by MAC addr and BSSID from
  * peer hash list, bssid check is done on matching peer
@@ -1659,7 +1709,6 @@ static struct wlan_objmgr_peer
  * Return: peer pointer
  *         NULL on FAILURE
  */
-#ifdef WLAN_OBJMGR_REF_ID_TRACE
 static struct wlan_objmgr_peer
 		*wlan_obj_psoc_peerlist_get_peer_by_mac_n_bssid_debug(
 					qdf_list_t *obj_list, uint8_t *macaddr,
@@ -1701,6 +1750,23 @@ static struct wlan_objmgr_peer
 	return NULL;
 }
 #else
+/**
+ * wlan_obj_psoc_peerlist_get_peer_by_mac_n_bssid() - get peer
+ *                                                    from psoc peer
+ *                                                    list using mac and vdev
+ *                                                    self mac
+ * @obj_list: Peer object list
+ * @macaddr: MAC address
+ * @bssid: BSSID address
+ * @pdev_id: Pdev id
+ * @dbg_id: id of the caller
+ *
+ * API to finds peer object pointer by MAC addr and BSSID from
+ * peer hash list, bssid check is done on matching peer
+ *
+ * Return: peer pointer
+ *         NULL on FAILURE
+ */
 static struct wlan_objmgr_peer *wlan_obj_psoc_peerlist_get_peer_by_mac_n_bssid(
 					qdf_list_t *obj_list, uint8_t *macaddr,
 					uint8_t *bssid, uint8_t pdev_id,
@@ -1796,14 +1862,16 @@ static struct wlan_objmgr_peer *wlan_obj_psoc_peerlist_get_peer_no_state(
 }
 #endif
 
+#ifdef WLAN_OBJMGR_REF_ID_TRACE
 /**
- * wlan_obj_psoc_populate_logically_del_peerlist_by_mac_n_bssid() -
+ * wlan_obj_psoc_populate_logically_del_peerlist_by_mac_n_bssid_debug() -
  *                                           get peer
  *                                           from psoc peer list using
  *                                           mac and vdev self mac
  * @obj_list: peer object list
  * @macaddr: MAC address
  * @bssid: BSSID address
+ * @pdev_id: pdev id
  * @dbg_id: id of the caller
  * @func: function name
  * @line: line number
@@ -1817,7 +1885,6 @@ static struct wlan_objmgr_peer *wlan_obj_psoc_peerlist_get_peer_no_state(
  * Return: list of peer pointers
  *         NULL on FAILURE
  */
-#ifdef WLAN_OBJMGR_REF_ID_TRACE
 static qdf_list_t
 	*wlan_obj_psoc_populate_logically_del_peerlist_by_mac_n_bssid_debug(
 				qdf_list_t *obj_list, uint8_t *macaddr,
@@ -1903,6 +1970,26 @@ static qdf_list_t
 	}
 }
 #else
+/**
+ * wlan_obj_psoc_populate_logically_del_peerlist_by_mac_n_bssid() -
+ *                                           get peer
+ *                                           from psoc peer list using
+ *                                           mac and vdev self mac
+ * @obj_list: peer object list
+ * @macaddr: MAC address
+ * @bssid: BSSID address
+ * @pdev_id: pdev id
+ * @dbg_id: id of the caller
+ *
+ * API to finds peer object pointer by MAC addr and BSSID from
+ * peer hash list for a node which is in logically deleted state,
+ * bssid check is done on matching peer
+ *
+ * Caller to free the list allocated in this function
+ *
+ * Return: list of peer pointers
+ *         NULL on FAILURE
+ */
 static qdf_list_t
 	*wlan_obj_psoc_populate_logically_del_peerlist_by_mac_n_bssid(
 				qdf_list_t *obj_list, uint8_t *macaddr,
@@ -2563,27 +2650,6 @@ struct wlan_objmgr_peer *wlan_objmgr_get_peer_no_state(
 qdf_export_symbol(wlan_objmgr_get_peer_no_state);
 #endif
 
-/**
- * wlan_objmgr_populate_logically_deleted_peerlist_by_mac_n_vdev() -
- *                                                           get peer from psoc
- *                                                           peer list using
- *                                                           mac and vdev
- *                                                           self mac
- * @psoc: PSOC object
- * @pdev_id: Pdev id
- * @macaddr: MAC address
- * @bssid: BSSID address. NULL mac means search all.
- * @dbg_id: id of the caller
- * @func: function name
- * @line: line number
- *
- * API to finds peer object pointer by MAC addr and BSSID from
- * peer hash list, bssid check is done on matching peer
- *
- * Return: list of peer pointer pointers
- *         NULL on FAILURE
- */
-
 #ifdef WLAN_OBJMGR_REF_ID_TRACE
 qdf_list_t *wlan_objmgr_populate_logically_deleted_peerlist_by_mac_n_vdev_debug(
 			struct wlan_objmgr_psoc *psoc, uint8_t pdev_id,

umac/cmn_services/obj_mgr/src/wlan_objmgr_psoc_obj_i.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 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
@@ -62,8 +63,8 @@
 
 /**
  * wlan_objmgr_psoc_pdev_attach() - store pdev in psoc's pdev list
- * @psoc - PSOC object
- * @pdev - PDEV object
+ * @psoc: PSOC object
+ * @pdev: PDEV object
  *
  * Attaches PDEV to PSOC, allocates PDEV id
  *
@@ -75,8 +76,8 @@ QDF_STATUS wlan_objmgr_psoc_pdev_attach(struct wlan_objmgr_psoc *psoc,
 
 /**
  * wlan_objmgr_psoc_pdev_detach() - remove pdev from psoc's pdev list
- * @psoc - PSOC object
- * @pdev - PDEV object
+ * @psoc: PSOC object
+ * @pdev: PDEV object
  *
  * detaches PDEV to PSOC, frees PDEV id
  *
@@ -88,8 +89,8 @@ QDF_STATUS wlan_objmgr_psoc_pdev_detach(struct wlan_objmgr_psoc *psoc,
 
 /**
  * wlan_objmgr_psoc_vdev_attach() - store vdev in psoc's vdev list
- * @psoc - PSOC object
- * @vdev - VDEV object
+ * @psoc: PSOC object
+ * @vdev: VDEV object
  *
  * Attaches VDEV to PSOC, allocates VDEV id
  *
@@ -101,8 +102,8 @@ QDF_STATUS wlan_objmgr_psoc_vdev_attach(struct wlan_objmgr_psoc *psoc,
 
 /**
  * wlan_objmgr_psoc_vdev_detach() - remove vdev from psoc's vdev list
- * @psoc - PSOC object
- * @vdev - VDEV object
+ * @psoc: PSOC object
+ * @vdev: VDEV object
  *
  * detaches VDEV to PSOC, frees VDEV id
  *
@@ -114,8 +115,8 @@ QDF_STATUS wlan_objmgr_psoc_vdev_detach(struct wlan_objmgr_psoc *psoc,
 
 /**
  * wlan_objmgr_psoc_peer_attach() - store peer in psoc's peer table
- * @psoc - PSOC object
- * @peer - PEER object
+ * @psoc: PSOC object
+ * @peer: PEER object
  *
  * Attaches PEER to PSOC, derives the HASH, add peer to its peer list
  *
@@ -127,8 +128,8 @@ QDF_STATUS wlan_objmgr_psoc_peer_attach(struct wlan_objmgr_psoc *psoc,
 
 /**
  * wlan_objmgr_psoc_peer_detach() - remove peer from psoc's peer table
- * @psoc - PSOC object
- * @peer - PEER object
+ * @psoc: PSOC object
+ * @peer: PEER object
  *
  * detaches PEER to PSOC, removes the peer from the peer list
  *

umac/cmn_services/obj_mgr/src/wlan_objmgr_vdev_obj.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 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
@@ -13,11 +13,10 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
  */
- /**
-  * DOC: Public APIs to perform operations on Global objects
-  */
+/**
+ * DOC: Public APIs to perform operations on Global objects
+ */
 #include <wlan_objmgr_cmn.h>
 #include <wlan_objmgr_global_obj.h>
 #include <wlan_objmgr_psoc_obj.h>
@@ -35,8 +34,8 @@
 #include <wlan_osif_priv.h>
 
 
-/**
- ** APIs to Create/Delete Global object APIs
+/*
+ * APIs to Create/Delete Global object APIs
  */
 
 static QDF_STATUS wlan_objmgr_vdev_object_status(
@@ -383,8 +382,8 @@ QDF_STATUS wlan_objmgr_vdev_obj_delete(struct wlan_objmgr_vdev *vdev)
 }
 qdf_export_symbol(wlan_objmgr_vdev_obj_delete);
 
-/**
- ** APIs to attach/detach component objects
+/*
+ * APIs to attach/detach component objects
  */
 QDF_STATUS wlan_objmgr_vdev_component_obj_attach(
 		struct wlan_objmgr_vdev *vdev,
@@ -466,7 +465,7 @@ QDF_STATUS wlan_objmgr_vdev_component_obj_detach(
 	vdev->obj_status[id] = QDF_STATUS_SUCCESS;
 	wlan_vdev_obj_unlock(vdev);
 
-	/**
+	/*
 	 *If VDEV object status is partially destroyed means, this API is
 	 * invoked with different context, this block should be executed for
 	 * async components only
@@ -516,8 +515,8 @@ QDF_STATUS wlan_objmgr_vdev_component_obj_detach(
 }
 qdf_export_symbol(wlan_objmgr_vdev_component_obj_detach);
 
-/**
- ** APIs to operations on vdev objects
+/*
+ * APIs to operations on vdev objects
  */
 QDF_STATUS wlan_objmgr_iterate_peerobj_list(
 		struct wlan_objmgr_vdev *vdev,
@@ -566,8 +565,8 @@ QDF_STATUS wlan_objmgr_iterate_peerobj_list(
 
 qdf_export_symbol(wlan_objmgr_iterate_peerobj_list);
 
-/**
- ** APIs to get a peer with given mac in a vdev
+/*
+ * APIs to get a peer with given mac in a vdev
  */
 struct wlan_objmgr_peer *
 wlan_objmgr_vdev_find_peer_by_mac(struct wlan_objmgr_vdev *vdev,