From 48debcb1f64ebe7c502bde10531e6a2703748cbc Mon Sep 17 00:00:00 2001 From: Akshay Kosigi Date: Mon, 8 Apr 2019 14:51:52 +0530 Subject: [PATCH] qcacmn: Move get macaddr API at proper place Move get macaddr from peer API at appropriate place instead of fetching it everytime and not using it. Change-Id: I01349a672215395795cd08cd65d98ad8a08b95b0 CRs-Fixed: 2431163 --- .../obj_mgr/src/wlan_objmgr_peer_obj.c | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/umac/cmn_services/obj_mgr/src/wlan_objmgr_peer_obj.c b/umac/cmn_services/obj_mgr/src/wlan_objmgr_peer_obj.c index ea9bee2e44b7..49c9007ad52a 100644 --- a/umac/cmn_services/obj_mgr/src/wlan_objmgr_peer_obj.c +++ b/umac/cmn_services/obj_mgr/src/wlan_objmgr_peer_obj.c @@ -616,9 +616,6 @@ qdf_export_symbol(wlan_objmgr_peer_get_ref); QDF_STATUS wlan_objmgr_peer_try_get_ref(struct wlan_objmgr_peer *peer, wlan_objmgr_ref_dbgid id) { - - uint8_t *macaddr; - if (!peer) { obj_mgr_err("peer obj is NULL for %d", id); QDF_ASSERT(0); @@ -626,15 +623,18 @@ QDF_STATUS wlan_objmgr_peer_try_get_ref(struct wlan_objmgr_peer *peer, } wlan_peer_obj_lock(peer); - macaddr = wlan_peer_get_macaddr(peer); if (peer->obj_state != WLAN_OBJ_STATE_CREATED) { wlan_peer_obj_unlock(peer); if (peer->peer_objmgr.print_cnt++ <= - WLAN_OBJMGR_RATELIMIT_THRESH) + WLAN_OBJMGR_RATELIMIT_THRESH) { + uint8_t *macaddr; + + macaddr = wlan_peer_get_macaddr(peer); obj_mgr_warn( "peer(" QDF_MAC_ADDR_STR ") not in Created st(%d)", QDF_MAC_ADDR_ARRAY(macaddr), - peer->obj_state); + peer->obj_state); + } return QDF_STATUS_E_RESOURCES; } @@ -650,10 +650,10 @@ static void wlan_objmgr_peer_release_debug_id_ref(struct wlan_objmgr_peer *peer, wlan_objmgr_ref_dbgid id) { - uint8_t *macaddr; - - macaddr = wlan_peer_get_macaddr(peer); if (!qdf_atomic_read(&peer->peer_objmgr.ref_id_dbg[id])) { + uint8_t *macaddr; + + macaddr = wlan_peer_get_macaddr(peer); obj_mgr_err( "peer(%02x:%02x:%02x:%02x:%02x:%02x) ref was not taken by %d", macaddr[0], macaddr[1], macaddr[2], @@ -674,17 +674,16 @@ wlan_objmgr_peer_release_debug_id_ref(struct wlan_objmgr_peer *peer, void wlan_objmgr_peer_release_ref(struct wlan_objmgr_peer *peer, wlan_objmgr_ref_dbgid id) { - uint8_t *macaddr; - if (!peer) { obj_mgr_err("peer obj is NULL for %d", id); QDF_ASSERT(0); return; } - macaddr = wlan_peer_get_macaddr(peer); - if (!qdf_atomic_read(&peer->peer_objmgr.ref_cnt)) { + uint8_t *macaddr; + + macaddr = wlan_peer_get_macaddr(peer); obj_mgr_err("peer(%02x:%02x:%02x:%02x:%02x:%02x) ref cnt is 0", macaddr[0], macaddr[1], macaddr[2], macaddr[3], macaddr[4], macaddr[5]);