diff --git a/os_if/linux/p2p/src/wlan_cfg80211_p2p.c b/os_if/linux/p2p/src/wlan_cfg80211_p2p.c index 3963b64fd6..57429a1db8 100644 --- a/os_if/linux/p2p/src/wlan_cfg80211_p2p.c +++ b/os_if/linux/p2p/src/wlan_cfg80211_p2p.c @@ -72,9 +72,7 @@ static void wlan_p2p_rx_callback(void *user_data, return; } - wlan_vdev_obj_lock(vdev); osif_priv = wlan_vdev_get_ospriv(vdev); - wlan_vdev_obj_unlock(vdev); if (!osif_priv) { cfg80211_err("osif_priv is null"); goto fail; @@ -148,9 +146,7 @@ static void wlan_p2p_action_tx_cnf_callback(void *user_data, return; } - wlan_vdev_obj_lock(vdev); osif_priv = wlan_vdev_get_ospriv(vdev); - wlan_vdev_obj_unlock(vdev); if (!osif_priv) { cfg80211_err("osif_priv is null"); goto fail; @@ -207,9 +203,7 @@ static void wlan_p2p_lo_event_callback(void *user_data, return; } - wlan_vdev_obj_lock(vdev); osif_priv = wlan_vdev_get_ospriv(vdev); - wlan_vdev_obj_unlock(vdev); if (!osif_priv) { cfg80211_err("osif_priv is null"); goto fail; @@ -278,9 +272,7 @@ static void wlan_p2p_event_callback(void *user_data, return; } - wlan_vdev_obj_lock(vdev); osif_priv = wlan_vdev_get_ospriv(vdev); - wlan_vdev_obj_unlock(vdev); if (!osif_priv) { cfg80211_err("osif_priv is null"); goto fail; @@ -360,10 +352,8 @@ int wlan_cfg80211_roc(struct wlan_objmgr_vdev *vdev, return -EINVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { cfg80211_err("psoc handle is NULL"); return -EINVAL; @@ -399,9 +389,7 @@ int wlan_cfg80211_cancel_roc(struct wlan_objmgr_vdev *vdev, return -EINVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { cfg80211_err("psoc handle is NULL"); return -EINVAL; @@ -431,10 +419,8 @@ int wlan_cfg80211_mgmt_tx(struct wlan_objmgr_vdev *vdev, return -EINVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { cfg80211_err("psoc handle is NULL"); return -EINVAL; @@ -485,9 +471,7 @@ int wlan_cfg80211_mgmt_tx_cancel(struct wlan_objmgr_vdev *vdev, return -EINVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { cfg80211_err("psoc handle is NULL"); return -EINVAL; diff --git a/os_if/linux/scan/src/wlan_cfg80211_scan.c b/os_if/linux/scan/src/wlan_cfg80211_scan.c index b71b14c03e..683a6692d0 100644 --- a/os_if/linux/scan/src/wlan_cfg80211_scan.c +++ b/os_if/linux/scan/src/wlan_cfg80211_scan.c @@ -135,9 +135,7 @@ static void wlan_cfg80211_pno_callback(struct wlan_objmgr_vdev *vdev, cfg80211_info("vdev id = %d", event->vdev_id); - wlan_vdev_obj_lock(vdev); pdev = wlan_vdev_get_pdev(vdev); - wlan_vdev_obj_unlock(vdev); if (!pdev) { cfg80211_err("pdev is NULL"); return; @@ -167,11 +165,9 @@ static QDF_STATUS wlan_cfg80211_is_pno_allowed(struct wlan_objmgr_vdev *vdev) enum tQDF_ADAPTER_MODE vdev_opmode; uint8_t vdev_id; - wlan_vdev_obj_lock(vdev); vdev_opmode = wlan_vdev_mlme_get_opmode(vdev); state = wlan_vdev_mlme_get_state(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); cfg80211_notice("dev_mode=%d, state=%d vdev id %d", vdev_opmode, state, vdev_id); @@ -284,9 +280,7 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_pdev *pdev, wlan_pdev_obj_unlock(pdev); req->networks_cnt = request->n_match_sets; - wlan_vdev_obj_lock(vdev); req->vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if ((!req->networks_cnt) || (req->networks_cnt > SCAN_PNO_MAX_SUPP_NETWORKS)) { diff --git a/os_if/linux/tdls/src/wlan_cfg80211_tdls.c b/os_if/linux/tdls/src/wlan_cfg80211_tdls.c index 238d27ba0f..7aa155afcb 100644 --- a/os_if/linux/tdls/src/wlan_cfg80211_tdls.c +++ b/os_if/linux/tdls/src/wlan_cfg80211_tdls.c @@ -78,9 +78,7 @@ void hdd_notify_teardown_tdls_links(struct wlan_objmgr_vdev *vdev) if (!vdev) return; - wlan_vdev_obj_lock(vdev); osif_priv = wlan_vdev_get_ospriv(vdev); - wlan_vdev_obj_unlock(vdev); tdls_priv = osif_priv->osif_tdls; @@ -160,12 +158,9 @@ int wlan_cfg80211_tdls_add_peer(struct wlan_objmgr_pdev *pdev, return -EINVAL; } - wlan_vdev_obj_lock(vdev); osif_priv = wlan_vdev_get_ospriv(vdev); tdls_priv = osif_priv->osif_tdls; - add_peer_req->vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); qdf_mem_copy(add_peer_req->peer_addr, mac, QDF_MAC_ADDR_SIZE); @@ -374,12 +369,9 @@ int wlan_cfg80211_tdls_update_peer(struct wlan_objmgr_pdev *pdev, } wlan_cfg80211_tdls_extract_params(req_info, params); - wlan_vdev_obj_lock(vdev); osif_priv = wlan_vdev_get_ospriv(vdev); tdls_priv = osif_priv->osif_tdls; - req_info->vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); qdf_mem_copy(req_info->peer_addr, mac, QDF_MAC_ADDR_SIZE); reinit_completion(&tdls_priv->tdls_add_peer_comp); @@ -516,10 +508,8 @@ int wlan_cfg80211_tdls_oper(struct wlan_objmgr_pdev *pdev, } break; case NL80211_TDLS_DISABLE_LINK: - wlan_vdev_obj_lock(vdev); osif_priv = wlan_vdev_get_ospriv(vdev); tdls_priv = osif_priv->osif_tdls; - wlan_vdev_obj_unlock(vdev); reinit_completion(&tdls_priv->tdls_del_peer_comp); status = ucfg_tdls_oper(vdev, peer, cmd); if (QDF_IS_STATUS_ERROR(status)) { @@ -573,9 +563,7 @@ void wlan_cfg80211_tdls_rx_callback(void *user_data, return; } - wlan_vdev_obj_lock(vdev); osif_priv = wlan_vdev_get_ospriv(vdev); - wlan_vdev_obj_unlock(vdev); if (!osif_priv) { cfg80211_err("osif_priv is null"); goto fail; @@ -637,9 +625,7 @@ int wlan_cfg80211_tdls_mgmt(struct wlan_objmgr_pdev *pdev, return -EIO; } - wlan_vdev_obj_lock(vdev); osif_priv = wlan_vdev_get_ospriv(vdev); - wlan_vdev_obj_unlock(vdev); tdls_priv = osif_priv->osif_tdls; @@ -742,9 +728,7 @@ wlan_cfg80211_tdls_indicate_discovery(struct tdls_osif_indication *ind) { struct vdev_osif_priv *osif_vdev; - wlan_vdev_obj_lock(ind->vdev); osif_vdev = wlan_vdev_get_ospriv(ind->vdev); - wlan_vdev_obj_unlock(ind->vdev); cfg80211_info("Implicit TDLS, request Send Discovery request"); cfg80211_tdls_oper_request(osif_vdev->wdev->netdev, @@ -757,9 +741,7 @@ wlan_cfg80211_tdls_indicate_setup(struct tdls_osif_indication *ind) { struct vdev_osif_priv *osif_vdev; - wlan_vdev_obj_lock(ind->vdev); osif_vdev = wlan_vdev_get_ospriv(ind->vdev); - wlan_vdev_obj_unlock(ind->vdev); cfg80211_info("Indication to request TDLS setup"); cfg80211_tdls_oper_request(osif_vdev->wdev->netdev, @@ -772,9 +754,7 @@ wlan_cfg80211_tdls_indicate_teardown(struct tdls_osif_indication *ind) { struct vdev_osif_priv *osif_vdev; - wlan_vdev_obj_lock(ind->vdev); osif_vdev = wlan_vdev_get_ospriv(ind->vdev); - wlan_vdev_obj_unlock(ind->vdev); cfg80211_info("Teardown reason %d", ind->reason); cfg80211_tdls_oper_request(osif_vdev->wdev->netdev, @@ -793,10 +773,8 @@ void wlan_cfg80211_tdls_event_callback(void *user_data, cfg80211_err("ind: %p", ind); return; } - wlan_vdev_obj_lock(ind->vdev); osif_vdev = wlan_vdev_get_ospriv(ind->vdev); tdls_priv = osif_vdev->osif_tdls; - wlan_vdev_obj_unlock(ind->vdev); switch (type) { case TDLS_EVENT_MGMT_TX_ACK_CNF: diff --git a/pmo/core/inc/wlan_pmo_main.h b/pmo/core/inc/wlan_pmo_main.h index 9c4d8d1288..f9c61f3f21 100644 --- a/pmo/core/inc/wlan_pmo_main.h +++ b/pmo/core/inc/wlan_pmo_main.h @@ -61,9 +61,7 @@ static inline enum tQDF_ADAPTER_MODE pmo_get_vdev_opmode( { enum tQDF_ADAPTER_MODE opmode; - wlan_vdev_obj_lock(vdev); opmode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); return opmode; } @@ -186,9 +184,7 @@ static inline enum tQDF_ADAPTER_MODE pmo_core_get_vdev_op_mode( if (!vdev) return op_mode; - wlan_vdev_obj_lock(vdev); op_mode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); return op_mode; } @@ -361,9 +357,7 @@ bool pmo_is_vdev_up(struct wlan_objmgr_vdev *vdev) pmo_err("vdev context is invalid!"); return false; } - wlan_vdev_obj_lock(vdev); state = wlan_vdev_mlme_get_state(vdev); - wlan_vdev_obj_unlock(vdev); return state == WLAN_VDEV_S_RUN; } diff --git a/pmo/core/inc/wlan_pmo_objmgr.h b/pmo/core/inc/wlan_pmo_objmgr.h index c2d82049a6..10b98894cc 100644 --- a/pmo/core/inc/wlan_pmo_objmgr.h +++ b/pmo/core/inc/wlan_pmo_objmgr.h @@ -59,9 +59,7 @@ pmo_vdev_get_id(struct wlan_objmgr_vdev *vdev) { uint8_t vdev_id; - wlan_vdev_obj_lock(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); QDF_BUG(vdev_id < WLAN_UMAC_PSOC_MAX_VDEVS); @@ -175,9 +173,7 @@ pmo_vdev_get_priv(struct wlan_objmgr_vdev *vdev) { struct pmo_vdev_priv_obj *vdev_priv; - wlan_vdev_obj_lock(vdev); vdev_priv = pmo_vdev_get_priv_nolock(vdev); - wlan_vdev_obj_unlock(vdev); QDF_BUG(vdev_priv); @@ -189,9 +185,7 @@ pmo_vdev_get_pdev(struct wlan_objmgr_vdev *vdev) { struct wlan_objmgr_pdev *pdev; - wlan_vdev_obj_lock(vdev); pdev = wlan_vdev_get_pdev(vdev); - wlan_vdev_obj_unlock(vdev); QDF_BUG(pdev); diff --git a/pmo/core/inc/wlan_pmo_suspend_resume.h b/pmo/core/inc/wlan_pmo_suspend_resume.h index 0896b831d6..516f428ec3 100644 --- a/pmo/core/inc/wlan_pmo_suspend_resume.h +++ b/pmo/core/inc/wlan_pmo_suspend_resume.h @@ -156,10 +156,8 @@ uint8_t pmo_core_get_vdev_dtim_period(struct wlan_objmgr_vdev *vdev) QDF_ASSERT(0); return 0; } - wlan_vdev_obj_lock(vdev); /* TODO */ /* dtim_period = wlan_vdev_mlme_get_dtim_period(vdev); */ - wlan_vdev_obj_unlock(vdev); return dtim_period; } @@ -180,10 +178,8 @@ uint16_t pmo_core_get_vdev_beacon_interval(struct wlan_objmgr_vdev *vdev) QDF_ASSERT(0); return 0; } - wlan_vdev_obj_lock(vdev); /* TODO */ /* beacon_interval = wlan_vdev_mlme_get_beacon_interval(vdev); */ - wlan_vdev_obj_unlock(vdev); return beacon_interval; } diff --git a/pmo/core/src/wlan_pmo_main.c b/pmo/core/src/wlan_pmo_main.c index 91080e41f6..58fac41e12 100644 --- a/pmo/core/src/wlan_pmo_main.c +++ b/pmo/core/src/wlan_pmo_main.c @@ -85,14 +85,11 @@ QDF_STATUS pmo_get_vdev_bss_peer_mac_addr(struct wlan_objmgr_vdev *vdev, return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); peer = wlan_vdev_get_bsspeer(vdev); if (!peer) { - wlan_vdev_obj_unlock(vdev); pmo_err("peer is null"); return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_unlock(vdev); wlan_peer_obj_lock(peer); qdf_mem_copy(bss_peer_mac_address->bytes, wlan_peer_get_macaddr(peer), @@ -124,17 +121,13 @@ bool pmo_core_is_vdev_connected(struct wlan_objmgr_vdev *vdev) struct wlan_objmgr_peer *peer; enum wlan_peer_state peer_state; - wlan_vdev_obj_lock(vdev); peer = wlan_vdev_get_bsspeer(vdev); - wlan_vdev_obj_unlock(vdev); if (!peer) { pmo_err("peer is null"); return false; } - wlan_peer_obj_lock(peer); peer_state = wlan_peer_mlme_get_state(peer); - wlan_peer_obj_unlock(peer); if (peer_state != WLAN_ASSOC_STATE) { pmo_err("peer is not associated.peer state: %d", diff --git a/target_if/dfs/src/target_if_dfs.c b/target_if/dfs/src/target_if_dfs.c index 5967851464..b779de18c4 100644 --- a/target_if/dfs/src/target_if_dfs.c +++ b/target_if/dfs/src/target_if_dfs.c @@ -78,9 +78,7 @@ static int target_if_dfs_cac_complete_event_handler( return -EINVAL; } - wlan_vdev_obj_lock(vdev); pdev = wlan_vdev_get_pdev(vdev); - wlan_vdev_obj_unlock(vdev); if (!pdev) { target_if_err("null pdev"); ret = -EINVAL; diff --git a/target_if/pmo/src/target_if_pmo_arp.c b/target_if/pmo/src/target_if_pmo_arp.c index 6ab5a85d89..b28b08a55f 100644 --- a/target_if/pmo/src/target_if_pmo_arp.c +++ b/target_if/pmo/src/target_if_pmo_arp.c @@ -40,10 +40,8 @@ QDF_STATUS target_if_pmo_send_arp_offload_req( return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; diff --git a/target_if/pmo/src/target_if_pmo_gtk.c b/target_if/pmo/src/target_if_pmo_gtk.c index 8d2456206c..8ffc462724 100644 --- a/target_if/pmo/src/target_if_pmo_gtk.c +++ b/target_if/pmo/src/target_if_pmo_gtk.c @@ -39,10 +39,8 @@ QDF_STATUS target_if_pmo_send_gtk_offload_req(struct wlan_objmgr_vdev *vdev, return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; @@ -77,10 +75,8 @@ QDF_STATUS target_if_pmo_send_gtk_response_req(struct wlan_objmgr_vdev *vdev) return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; diff --git a/target_if/pmo/src/target_if_pmo_mc_addr_filtering.c b/target_if/pmo/src/target_if_pmo_mc_addr_filtering.c index 1874b36877..bd3b29b8ae 100644 --- a/target_if/pmo/src/target_if_pmo_mc_addr_filtering.c +++ b/target_if/pmo/src/target_if_pmo_mc_addr_filtering.c @@ -40,10 +40,8 @@ QDF_STATUS target_if_pmo_set_mc_filter_req( return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; @@ -72,10 +70,8 @@ QDF_STATUS target_if_pmo_clear_mc_filter_req( return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; diff --git a/target_if/pmo/src/target_if_pmo_ns.c b/target_if/pmo/src/target_if_pmo_ns.c index d2879df682..6b2946b88f 100644 --- a/target_if/pmo/src/target_if_pmo_ns.c +++ b/target_if/pmo/src/target_if_pmo_ns.c @@ -40,10 +40,8 @@ QDF_STATUS target_if_pmo_send_ns_offload_req( return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; diff --git a/target_if/pmo/src/target_if_pmo_pkt_filter.c b/target_if/pmo/src/target_if_pmo_pkt_filter.c index 9803e99ce6..7907c7a0a0 100644 --- a/target_if/pmo/src/target_if_pmo_pkt_filter.c +++ b/target_if/pmo/src/target_if_pmo_pkt_filter.c @@ -39,10 +39,8 @@ QDF_STATUS target_if_pmo_send_pkt_filter_req(struct wlan_objmgr_vdev *vdev, return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; @@ -80,10 +78,8 @@ QDF_STATUS target_if_pmo_clear_pkt_filter_req(struct wlan_objmgr_vdev *vdev, return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; diff --git a/target_if/pmo/src/target_if_pmo_static_config.c b/target_if/pmo/src/target_if_pmo_static_config.c index 9974622288..8207e361dd 100644 --- a/target_if/pmo/src/target_if_pmo_static_config.c +++ b/target_if/pmo/src/target_if_pmo_static_config.c @@ -39,10 +39,8 @@ QDF_STATUS target_if_pmo_send_ra_filter_req(struct wlan_objmgr_vdev *vdev, return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; @@ -70,10 +68,8 @@ QDF_STATUS target_if_pmo_send_action_frame_patterns( return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; @@ -100,10 +96,8 @@ QDF_STATUS target_if_pmo_send_enhance_mc_offload_req( return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; diff --git a/target_if/pmo/src/target_if_pmo_suspend_resume.c b/target_if/pmo/src/target_if_pmo_suspend_resume.c index 3fd48cb3f1..fbbd638d89 100644 --- a/target_if/pmo/src/target_if_pmo_suspend_resume.c +++ b/target_if/pmo/src/target_if_pmo_suspend_resume.c @@ -42,10 +42,8 @@ QDF_STATUS target_if_pmo_send_vdev_update_param_req( return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; @@ -87,10 +85,8 @@ QDF_STATUS target_if_pmo_send_vdev_ps_param_req( return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; diff --git a/target_if/pmo/src/target_if_pmo_wow.c b/target_if/pmo/src/target_if_pmo_wow.c index 4da3e244ce..00c7e3e1ca 100644 --- a/target_if/pmo/src/target_if_pmo_wow.c +++ b/target_if/pmo/src/target_if_pmo_wow.c @@ -39,10 +39,8 @@ QDF_STATUS target_if_pmo_enable_wow_wakeup_event(struct wlan_objmgr_vdev *vdev, return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; @@ -68,10 +66,8 @@ QDF_STATUS target_if_pmo_disable_wow_wakeup_event(struct wlan_objmgr_vdev *vdev, return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; @@ -100,10 +96,8 @@ QDF_STATUS target_if_pmo_send_wow_patterns_to_fw(struct wlan_objmgr_vdev *vdev, return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { target_if_err("psoc handle is NULL"); return QDF_STATUS_E_INVAL; diff --git a/target_if/son/src/target_if_son.c b/target_if/son/src/target_if_son.c index d002cb561b..8860a3f702 100644 --- a/target_if/son/src/target_if_son.c +++ b/target_if/son/src/target_if_son.c @@ -30,13 +30,9 @@ bool son_ol_is_peer_inact(struct wlan_objmgr_peer *peer) struct wlan_objmgr_pdev *pdev = NULL; struct wlan_objmgr_vdev *vdev = NULL; - wlan_peer_obj_lock(peer); vdev = wlan_peer_get_vdev(peer); - wlan_peer_obj_unlock(peer); - wlan_vdev_obj_lock(vdev); pdev = wlan_vdev_get_pdev(vdev); - wlan_vdev_obj_unlock(vdev); return cdp_peer_is_inact(ol_if_pdev_get_soc_txhandle(pdev), (void *)(ol_if_peer_get_txrx_handle(peer))); diff --git a/umac/cmn_services/crypto/src/wlan_crypto_global_api.c b/umac/cmn_services/crypto/src/wlan_crypto_global_api.c index 54075f6a7c..f9c10b8eb6 100644 --- a/umac/cmn_services/crypto/src/wlan_crypto_global_api.c +++ b/umac/cmn_services/crypto/src/wlan_crypto_global_api.c @@ -346,8 +346,9 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev, req_key->flags |= WLAN_CRYPTO_KEY_GROUP; } - wlan_vdev_obj_lock(vdev); vdev_mode = wlan_vdev_mlme_get_opmode(vdev); + + wlan_vdev_obj_lock(vdev); qdf_mem_copy(macaddr, wlan_vdev_mlme_get_macaddr(vdev), WLAN_ALEN); psoc = wlan_vdev_get_psoc(vdev); if (!psoc) { @@ -384,9 +385,7 @@ QDF_STATUS wlan_crypto_setkey(struct wlan_objmgr_vdev *vdev, key = crypto_priv->key[req_key->keyix]; } if (vdev_mode == QDF_STA_MODE) { - wlan_vdev_obj_lock(vdev); peer = wlan_vdev_get_bsspeer(vdev); - wlan_vdev_obj_unlock(vdev); if (!peer) { qdf_print("%s[%d] peer is null\n", __func__, __LINE__); @@ -2135,10 +2134,8 @@ QDF_STATUS wlan_crypto_set_peer_wep_keys(struct wlan_objmgr_vdev *vdev, if (!vdev) return QDF_STATUS_E_NULL_VALUE; - wlan_vdev_obj_lock(vdev); opmode = wlan_vdev_mlme_get_opmode(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { qdf_print("%s[%d] psoc NULL\n", __func__, __LINE__); diff --git a/umac/cmn_services/crypto/src/wlan_crypto_obj_mgr_i.h b/umac/cmn_services/crypto/src/wlan_crypto_obj_mgr_i.h index aa28062ebb..013df9c46c 100644 --- a/umac/cmn_services/crypto/src/wlan_crypto_obj_mgr_i.h +++ b/umac/cmn_services/crypto/src/wlan_crypto_obj_mgr_i.h @@ -27,10 +27,8 @@ static inline void *wlan_get_vdev_crypto_obj(struct wlan_objmgr_vdev *vdev) { void *crypto_priv; - wlan_vdev_obj_lock(vdev); crypto_priv = wlan_objmgr_vdev_get_comp_private_obj(vdev, WLAN_UMAC_COMP_CRYPTO); - wlan_vdev_obj_unlock(vdev); return crypto_priv; } @@ -38,10 +36,8 @@ static inline void *wlan_get_vdev_crypto_obj(struct wlan_objmgr_vdev *vdev) static inline void *wlan_get_peer_crypto_obj(struct wlan_objmgr_peer *peer) { void *crypto_priv; - wlan_peer_obj_lock(peer); crypto_priv = wlan_objmgr_peer_get_comp_private_obj(peer, WLAN_UMAC_COMP_CRYPTO); - wlan_peer_obj_unlock(peer); return crypto_priv; } diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h index 0b324c39ef..bdf031409d 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h @@ -447,7 +447,6 @@ static inline struct wlan_objmgr_psoc *wlan_pdev_get_psoc( static inline void wlan_pdev_set_psoc(struct wlan_objmgr_pdev *pdev, struct wlan_objmgr_psoc *psoc) { - /* This API is invoked with lock acquired, do not add log prints */ pdev->pdev_objmgr.wlan_psoc = psoc; } @@ -463,7 +462,6 @@ static inline void wlan_pdev_set_psoc(struct wlan_objmgr_pdev *pdev, static inline void wlan_pdev_nif_fw_cap_set(struct wlan_objmgr_pdev *pdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ pdev->pdev_nif.pdev_fw_caps |= cap; } @@ -479,7 +477,6 @@ static inline void wlan_pdev_nif_fw_cap_set(struct wlan_objmgr_pdev *pdev, static inline void wlan_pdev_nif_fw_cap_clear(struct wlan_objmgr_pdev *pdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ pdev->pdev_nif.pdev_fw_caps &= ~cap; } @@ -495,7 +492,6 @@ static inline void wlan_pdev_nif_fw_cap_clear(struct wlan_objmgr_pdev *pdev, static inline uint8_t wlan_pdev_nif_fw_cap_get(struct wlan_objmgr_pdev *pdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ return (pdev->pdev_nif.pdev_fw_caps & cap) ? 1 : 0; } @@ -511,7 +507,6 @@ static inline uint8_t wlan_pdev_nif_fw_cap_get(struct wlan_objmgr_pdev *pdev, static inline void wlan_pdev_nif_feat_cap_set(struct wlan_objmgr_pdev *pdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ pdev->pdev_nif.pdev_feature_caps |= cap; } @@ -527,7 +522,6 @@ static inline void wlan_pdev_nif_feat_cap_set(struct wlan_objmgr_pdev *pdev, static inline void wlan_pdev_nif_feat_cap_clear(struct wlan_objmgr_pdev *pdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ pdev->pdev_nif.pdev_feature_caps &= ~cap; } @@ -543,7 +537,6 @@ static inline void wlan_pdev_nif_feat_cap_clear(struct wlan_objmgr_pdev *pdev, static inline uint8_t wlan_pdev_nif_feat_cap_get(struct wlan_objmgr_pdev *pdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ return (pdev->pdev_nif.pdev_feature_caps & cap) ? 1 : 0; } @@ -610,7 +603,6 @@ static inline struct pdev_osif_priv *wlan_pdev_get_ospriv( */ static inline void wlan_pdev_reset_ospriv(struct wlan_objmgr_pdev *pdev) { - /* This API is invoked with lock acquired, do not add log prints */ pdev->pdev_nif.pdev_ospriv = NULL; } @@ -626,7 +618,6 @@ static inline void wlan_pdev_reset_ospriv(struct wlan_objmgr_pdev *pdev) static inline void wlan_pdev_set_max_vdev_count(struct wlan_objmgr_pdev *pdev, uint8_t max_vdev_count) { - /* This API is invoked with lock acquired, do not add log prints */ pdev->pdev_objmgr.max_vdev_count = max_vdev_count; } @@ -641,7 +632,6 @@ static inline void wlan_pdev_set_max_vdev_count(struct wlan_objmgr_pdev *pdev, static inline uint8_t wlan_pdev_get_max_vdev_count( struct wlan_objmgr_pdev *pdev) { - /* This API is invoked with lock acquired, do not add log prints */ return pdev->pdev_objmgr.max_vdev_count; } @@ -767,7 +757,6 @@ static inline void wlan_pdev_set_tgt_if_handle(struct wlan_objmgr_pdev *pdev, */ static inline void *wlan_pdev_get_tgt_if_handle(struct wlan_objmgr_pdev *pdev) { - /* This API is invoked with lock acquired, do not add log prints */ if (pdev == NULL) return NULL; diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h index a4ec11c821..e3e54a01f6 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h @@ -566,7 +566,6 @@ static inline void wlan_peer_set_next_peer_of_psoc(qdf_list_t *peer_list, static inline void wlan_peer_set_peer_type(struct wlan_objmgr_peer *peer, enum wlan_peer_type type) { - /* This API is invoked with lock acquired, do not add log prints */ peer->peer_mlme.peer_type = type; } @@ -582,7 +581,6 @@ static inline void wlan_peer_set_peer_type(struct wlan_objmgr_peer *peer, static inline enum wlan_peer_type wlan_peer_get_peer_type( struct wlan_objmgr_peer *peer) { - /* This API is invoked with lock acquired, do not add log prints */ return peer->peer_mlme.peer_type; } @@ -633,7 +631,6 @@ static inline uint8_t *wlan_peer_get_macaddr(struct wlan_objmgr_peer *peer) static inline struct wlan_objmgr_vdev *wlan_peer_get_vdev( struct wlan_objmgr_peer *peer) { - /* This API is invoked with lock acquired, do not add log prints */ return peer->peer_objmgr.vdev; } @@ -649,7 +646,6 @@ static inline struct wlan_objmgr_vdev *wlan_peer_get_vdev( static inline void wlan_peer_set_vdev(struct wlan_objmgr_peer *peer, struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ peer->peer_objmgr.vdev = vdev; } @@ -665,7 +661,6 @@ static inline void wlan_peer_set_vdev(struct wlan_objmgr_peer *peer, static inline void wlan_peer_mlme_flag_set(struct wlan_objmgr_peer *peer, uint32_t flag) { - /* This API is invoked with lock acquired, do not add log prints */ peer->peer_mlme.peer_flags |= flag; } @@ -681,7 +676,6 @@ static inline void wlan_peer_mlme_flag_set(struct wlan_objmgr_peer *peer, static inline void wlan_peer_mlme_flag_clear(struct wlan_objmgr_peer *peer, uint32_t flag) { - /* This API is invoked with lock acquired, do not add log prints */ peer->peer_mlme.peer_flags &= ~flag; } @@ -697,7 +691,6 @@ static inline void wlan_peer_mlme_flag_clear(struct wlan_objmgr_peer *peer, static inline uint8_t wlan_peer_mlme_flag_get(struct wlan_objmgr_peer *peer, uint32_t flag) { - /* This API is invoked with lock acquired, do not add log prints */ return (peer->peer_mlme.peer_flags & flag) ? 1 : 0; } @@ -714,7 +707,6 @@ static inline void wlan_peer_mlme_set_state( struct wlan_objmgr_peer *peer, enum wlan_peer_state state) { - /* This API is invoked with lock acquired, do not add log prints */ peer->peer_mlme.state = state; } @@ -731,7 +723,6 @@ static inline void wlan_peer_mlme_set_auth_state( struct wlan_objmgr_peer *peer, bool is_authenticated) { - /* This API is invoked with lock acquired, do not add log prints */ peer->peer_mlme.is_authenticated = is_authenticated; } @@ -746,7 +737,6 @@ static inline void wlan_peer_mlme_set_auth_state( static inline enum wlan_peer_state wlan_peer_mlme_get_state( struct wlan_objmgr_peer *peer) { - /* This API is invoked with lock acquired, do not add log prints */ return peer->peer_mlme.state; } @@ -761,7 +751,6 @@ static inline enum wlan_peer_state wlan_peer_mlme_get_state( static inline bool wlan_peer_mlme_get_auth_state( struct wlan_objmgr_peer *peer) { - /* This API is invoked with lock acquired, do not add log prints */ return peer->peer_mlme.is_authenticated; } diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h index 0d5e4d040e..38d83a634f 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h @@ -764,7 +764,6 @@ static inline void wlan_psoc_obj_unlock(struct wlan_objmgr_psoc *psoc) static inline void wlan_psoc_set_nif_phy_version(struct wlan_objmgr_psoc *psoc, uint32_t phy_ver) { - /* This API is invoked with lock acquired, do not add log prints */ psoc->soc_nif.phy_version = phy_ver; } @@ -779,7 +778,6 @@ static inline void wlan_psoc_set_nif_phy_version(struct wlan_objmgr_psoc *psoc, static inline uint32_t wlan_psoc_get_nif_phy_version( struct wlan_objmgr_psoc *psoc) { - /* This API is invoked with lock acquired, do not add log prints */ if (psoc == NULL) return (uint32_t)-1; @@ -798,7 +796,6 @@ static inline uint32_t wlan_psoc_get_nif_phy_version( static inline void wlan_psoc_set_dev_type(struct wlan_objmgr_psoc *psoc, WLAN_DEV_TYPE phy_type) { - /* This API is invoked with lock acquired, do not add log prints */ psoc->soc_nif.phy_type = phy_type; } @@ -813,7 +810,6 @@ static inline void wlan_psoc_set_dev_type(struct wlan_objmgr_psoc *psoc, static inline WLAN_DEV_TYPE wlan_objmgr_psoc_get_dev_type( struct wlan_objmgr_psoc *psoc) { - /* This API is invoked with lock acquired, do not add log prints */ if (psoc == NULL) return (uint32_t)-1; @@ -832,7 +828,6 @@ static inline WLAN_DEV_TYPE wlan_objmgr_psoc_get_dev_type( static inline void wlan_psoc_nif_fw_cap_set(struct wlan_objmgr_psoc *psoc, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ psoc->soc_nif.soc_fw_caps |= cap; } @@ -848,7 +843,6 @@ static inline void wlan_psoc_nif_fw_cap_set(struct wlan_objmgr_psoc *psoc, static inline void wlan_psoc_nif_fw_cap_clear(struct wlan_objmgr_psoc *psoc, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ psoc->soc_nif.soc_fw_caps &= ~cap; } @@ -864,7 +858,6 @@ static inline void wlan_psoc_nif_fw_cap_clear(struct wlan_objmgr_psoc *psoc, static inline uint8_t wlan_psoc_nif_fw_cap_get(struct wlan_objmgr_psoc *psoc, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ return (psoc->soc_nif.soc_fw_caps & cap) ? 1 : 0; } @@ -880,7 +873,6 @@ static inline uint8_t wlan_psoc_nif_fw_cap_get(struct wlan_objmgr_psoc *psoc, static inline void wlan_psoc_nif_fw_ext_cap_set(struct wlan_objmgr_psoc *psoc, uint32_t ext_cap) { - /* This API is invoked with lock acquired, do not add log prints */ psoc->soc_nif.soc_fw_ext_caps |= ext_cap; } @@ -896,7 +888,6 @@ static inline void wlan_psoc_nif_fw_ext_cap_set(struct wlan_objmgr_psoc *psoc, static inline void wlan_psoc_nif_fw_ext_cap_clear(struct wlan_objmgr_psoc *psoc, uint32_t ext_cap) { - /* This API is invoked with lock acquired, do not add log prints */ psoc->soc_nif.soc_fw_ext_caps &= ~ext_cap; } @@ -912,7 +903,6 @@ static inline void wlan_psoc_nif_fw_ext_cap_clear(struct wlan_objmgr_psoc *psoc, static inline uint8_t wlan_psoc_nif_fw_ext_cap_get( struct wlan_objmgr_psoc *psoc, uint32_t ext_cap) { - /* This API is invoked with lock acquired, do not add log prints */ return (psoc->soc_nif.soc_fw_ext_caps & ext_cap) ? 1 : 0; } @@ -928,7 +918,6 @@ static inline uint8_t wlan_psoc_nif_fw_ext_cap_get( static inline void wlan_psoc_nif_feat_cap_set(struct wlan_objmgr_psoc *psoc, uint32_t feat_cap) { - /* This API is invoked with lock acquired, do not add log prints */ psoc->soc_nif.soc_feature_caps |= feat_cap; } @@ -944,7 +933,6 @@ static inline void wlan_psoc_nif_feat_cap_set(struct wlan_objmgr_psoc *psoc, static inline void wlan_psoc_nif_feat_cap_clear(struct wlan_objmgr_psoc *psoc, uint32_t feat_cap) { - /* This API is invoked with lock acquired, do not add log prints */ psoc->soc_nif.soc_feature_caps &= ~feat_cap; } @@ -960,7 +948,6 @@ static inline void wlan_psoc_nif_feat_cap_clear(struct wlan_objmgr_psoc *psoc, static inline uint8_t wlan_psoc_nif_feat_cap_get(struct wlan_objmgr_psoc *psoc, uint32_t feat_cap) { - /* This API is invoked with lock acquired, do not add log prints */ return (psoc->soc_nif.soc_feature_caps & feat_cap) ? 1 : 0; } @@ -993,7 +980,6 @@ static inline void wlan_psoc_set_hw_macaddr(struct wlan_objmgr_psoc *psoc, */ static inline uint8_t *wlan_psoc_get_hw_macaddr(struct wlan_objmgr_psoc *psoc) { - /* This API is invoked with lock acquired, do not add log prints */ if (psoc == NULL) return NULL; @@ -1022,7 +1008,6 @@ void *wlan_objmgr_psoc_get_comp_private_obj(struct wlan_objmgr_psoc *psoc, */ static inline uint8_t wlan_psoc_get_pdev_count(struct wlan_objmgr_psoc *psoc) { - /* This API is invoked with lock acquired, do not add log prints */ if (psoc == NULL) return 0; @@ -1041,7 +1026,6 @@ static inline uint8_t wlan_psoc_get_pdev_count(struct wlan_objmgr_psoc *psoc) static inline void wlan_psoc_set_tgt_if_handle(struct wlan_objmgr_psoc *psoc, void *tgt_if_handle) { - /* This API is invoked with lock acquired, do not add log prints */ if (psoc == NULL) return; @@ -1058,7 +1042,6 @@ static inline void wlan_psoc_set_tgt_if_handle(struct wlan_objmgr_psoc *psoc, */ static inline void *wlan_psoc_get_tgt_if_handle(struct wlan_objmgr_psoc *psoc) { - /* This API is invoked with lock acquired, do not add log prints */ if (psoc == NULL) return NULL; @@ -1076,7 +1059,6 @@ static inline void *wlan_psoc_get_tgt_if_handle(struct wlan_objmgr_psoc *psoc) static inline qdf_device_t wlan_psoc_get_qdf_dev( struct wlan_objmgr_psoc *psoc) { - /* This API is invoked with lock acquired, do not add log prints */ if (psoc == NULL) return NULL; @@ -1096,7 +1078,6 @@ static inline void wlan_psoc_set_qdf_dev( struct wlan_objmgr_psoc *psoc, qdf_device_t dev) { - /* This API is invoked with lock acquired, do not add log prints */ if (psoc == NULL) return; @@ -1197,7 +1178,6 @@ QDF_STATUS wlan_objmgr_psoc_set_user_config(struct wlan_objmgr_psoc *psoc, static inline uint32_t wlan_objmgr_psoc_get_dual_mac_disable( struct wlan_objmgr_psoc *psoc) { - /* This API is invoked with lock acquired, do not add log prints */ if (psoc == NULL) return 0; return psoc->soc_nif.user_config.dual_mac_feature_disable; @@ -1213,7 +1193,6 @@ static inline uint32_t wlan_objmgr_psoc_get_dual_mac_disable( static inline uint8_t wlan_objmgr_psoc_get_band_capability( struct wlan_objmgr_psoc *psoc) { - /* This API is invoked with lock acquired, do not add log prints */ if (psoc == NULL) return 0; diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h index f104400ac2..e4b469147c 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h @@ -514,7 +514,6 @@ void *wlan_objmgr_vdev_get_comp_private_obj( static inline struct wlan_objmgr_pdev *wlan_vdev_get_pdev( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_objmgr.wlan_pdev; } @@ -607,7 +606,6 @@ static inline struct wlan_objmgr_psoc *wlan_vdev_get_psoc( struct wlan_objmgr_pdev *pdev; struct wlan_objmgr_psoc *psoc = NULL; - /* This API is invoked with lock acquired, do not add log prints */ pdev = wlan_vdev_get_pdev(vdev); if (pdev == NULL) return NULL; @@ -629,7 +627,6 @@ static inline struct wlan_objmgr_psoc *wlan_vdev_get_psoc( static inline void wlan_vdev_mlme_set_opmode(struct wlan_objmgr_vdev *vdev, enum tQDF_ADAPTER_MODE mode) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.vdev_opmode = mode; } @@ -645,7 +642,6 @@ static inline void wlan_vdev_mlme_set_opmode(struct wlan_objmgr_vdev *vdev, static inline enum tQDF_ADAPTER_MODE wlan_vdev_mlme_get_opmode( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_mlme.vdev_opmode; } @@ -730,7 +726,6 @@ static inline uint8_t *wlan_vdev_mlme_get_mataddr(struct wlan_objmgr_vdev *vdev) */ static inline uint8_t wlan_vdev_get_id(struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_objmgr.vdev_id; } @@ -854,7 +849,6 @@ static inline void wlan_vdev_obj_unlock(struct wlan_objmgr_vdev *vdev) static inline void wlan_vdev_mlme_set_bss_chan(struct wlan_objmgr_vdev *vdev, struct wlan_channel *bss_chan) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.bss_chan = bss_chan; } @@ -870,7 +864,6 @@ static inline void wlan_vdev_mlme_set_bss_chan(struct wlan_objmgr_vdev *vdev, static inline struct wlan_channel *wlan_vdev_mlme_get_bss_chan( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_mlme.bss_chan; } @@ -886,7 +879,6 @@ static inline struct wlan_channel *wlan_vdev_mlme_get_bss_chan( static inline void wlan_vdev_mlme_set_des_chan(struct wlan_objmgr_vdev *vdev, struct wlan_channel *des_chan) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.des_chan = des_chan; } @@ -902,7 +894,6 @@ static inline void wlan_vdev_mlme_set_des_chan(struct wlan_objmgr_vdev *vdev, static inline struct wlan_channel *wlan_vdev_mlme_get_des_chan( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_mlme.des_chan; } @@ -918,7 +909,6 @@ static inline struct wlan_channel *wlan_vdev_mlme_get_des_chan( static inline void wlan_vdev_mlme_set_nss(struct wlan_objmgr_vdev *vdev, uint8_t nss) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.nss = nss; } @@ -934,7 +924,6 @@ static inline void wlan_vdev_mlme_set_nss(struct wlan_objmgr_vdev *vdev, static inline uint8_t wlan_vdev_mlme_get_nss( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_mlme.nss; } @@ -950,7 +939,6 @@ static inline uint8_t wlan_vdev_mlme_get_nss( static inline void wlan_vdev_mlme_set_txchainmask(struct wlan_objmgr_vdev *vdev, uint8_t chainmask) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.tx_chainmask = chainmask; } @@ -966,7 +954,6 @@ static inline void wlan_vdev_mlme_set_txchainmask(struct wlan_objmgr_vdev *vdev, static inline uint8_t wlan_vdev_mlme_get_txchainmask( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_mlme.tx_chainmask; } @@ -982,7 +969,6 @@ static inline uint8_t wlan_vdev_mlme_get_txchainmask( static inline void wlan_vdev_mlme_set_rxchainmask(struct wlan_objmgr_vdev *vdev, uint8_t chainmask) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.rx_chainmask = chainmask; } @@ -1014,7 +1000,6 @@ static inline uint8_t wlan_vdev_mlme_get_rxchainmask( static inline void wlan_vdev_mlme_set_txpower(struct wlan_objmgr_vdev *vdev, uint8_t txpow) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.tx_power = txpow; } @@ -1030,7 +1015,6 @@ static inline void wlan_vdev_mlme_set_txpower(struct wlan_objmgr_vdev *vdev, static inline uint8_t wlan_vdev_mlme_get_txpower( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_mlme.tx_power; } @@ -1046,7 +1030,6 @@ static inline uint8_t wlan_vdev_mlme_get_txpower( static inline void wlan_vdev_mlme_set_maxrate(struct wlan_objmgr_vdev *vdev, uint32_t maxrate) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.max_rate = maxrate; } @@ -1062,7 +1045,6 @@ static inline void wlan_vdev_mlme_set_maxrate(struct wlan_objmgr_vdev *vdev, static inline uint32_t wlan_vdev_mlme_get_maxrate( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_mlme.max_rate; } @@ -1078,7 +1060,6 @@ static inline uint32_t wlan_vdev_mlme_get_maxrate( static inline void wlan_vdev_mlme_set_txmgmtrate(struct wlan_objmgr_vdev *vdev, uint32_t txmgmtrate) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.tx_mgmt_rate = txmgmtrate; } @@ -1094,7 +1075,6 @@ static inline void wlan_vdev_mlme_set_txmgmtrate(struct wlan_objmgr_vdev *vdev, static inline uint32_t wlan_vdev_mlme_get_txmgmtrate( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_mlme.tx_mgmt_rate; } @@ -1110,7 +1090,6 @@ static inline uint32_t wlan_vdev_mlme_get_txmgmtrate( static inline void wlan_vdev_mlme_feat_cap_set(struct wlan_objmgr_vdev *vdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.vdev_feat_caps |= cap; } @@ -1126,7 +1105,6 @@ static inline void wlan_vdev_mlme_feat_cap_set(struct wlan_objmgr_vdev *vdev, static inline void wlan_vdev_mlme_feat_cap_clear(struct wlan_objmgr_vdev *vdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.vdev_feat_caps &= ~cap; } @@ -1143,7 +1121,6 @@ static inline void wlan_vdev_mlme_feat_cap_clear(struct wlan_objmgr_vdev *vdev, static inline uint8_t wlan_vdev_mlme_feat_cap_get(struct wlan_objmgr_vdev *vdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ return (vdev->vdev_mlme.vdev_feat_caps & cap) ? 1 : 0; } @@ -1160,7 +1137,6 @@ static inline void wlan_vdev_mlme_feat_ext_cap_set( struct wlan_objmgr_vdev *vdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.vdev_feat_ext_caps |= cap; } @@ -1177,7 +1153,6 @@ static inline void wlan_vdev_mlme_feat_ext_cap_clear( struct wlan_objmgr_vdev *vdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.vdev_feat_ext_caps &= ~cap; } @@ -1195,7 +1170,6 @@ static inline uint8_t wlan_vdev_mlme_feat_ext_cap_get( struct wlan_objmgr_vdev *vdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ return (vdev->vdev_mlme.vdev_feat_ext_caps & cap) ? 1 : 0; } @@ -1211,7 +1185,6 @@ static inline uint8_t wlan_vdev_mlme_feat_ext_cap_get( static inline void wlan_vdev_mlme_cap_set(struct wlan_objmgr_vdev *vdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.vdev_caps |= cap; } @@ -1227,7 +1200,6 @@ static inline void wlan_vdev_mlme_cap_set(struct wlan_objmgr_vdev *vdev, static inline void wlan_vdev_mlme_cap_clear(struct wlan_objmgr_vdev *vdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_mlme.vdev_caps &= ~cap; } @@ -1244,7 +1216,6 @@ static inline void wlan_vdev_mlme_cap_clear(struct wlan_objmgr_vdev *vdev, static inline uint8_t wlan_vdev_mlme_cap_get(struct wlan_objmgr_vdev *vdev, uint32_t cap) { - /* This API is invoked with lock acquired, do not add log prints */ return (vdev->vdev_mlme.vdev_caps & cap) ? 1 : 0; } @@ -1259,7 +1230,6 @@ static inline uint8_t wlan_vdev_mlme_cap_get(struct wlan_objmgr_vdev *vdev, static inline enum wlan_vdev_state wlan_vdev_mlme_get_state( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_mlme.mlme_state; } @@ -1275,7 +1245,6 @@ static inline enum wlan_vdev_state wlan_vdev_mlme_get_state( static inline void wlan_vdev_mlme_set_state(struct wlan_objmgr_vdev *vdev, enum wlan_vdev_state state) { - /* This API is invoked with lock acquired, do not add log prints */ if (state < WLAN_VDEV_S_MAX) vdev->vdev_mlme.mlme_state = state; } @@ -1292,7 +1261,6 @@ static inline void wlan_vdev_mlme_set_state(struct wlan_objmgr_vdev *vdev, static inline void wlan_vdev_set_selfpeer(struct wlan_objmgr_vdev *vdev, struct wlan_objmgr_peer *peer) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_objmgr.self_peer = peer; } @@ -1308,7 +1276,6 @@ static inline void wlan_vdev_set_selfpeer(struct wlan_objmgr_vdev *vdev, static inline struct wlan_objmgr_peer *wlan_vdev_get_selfpeer( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_objmgr.self_peer; } @@ -1324,7 +1291,6 @@ static inline struct wlan_objmgr_peer *wlan_vdev_get_selfpeer( static inline void wlan_vdev_set_bsspeer(struct wlan_objmgr_vdev *vdev, struct wlan_objmgr_peer *peer) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_objmgr.bss_peer = peer; } @@ -1340,7 +1306,6 @@ static inline void wlan_vdev_set_bsspeer(struct wlan_objmgr_vdev *vdev, static inline struct wlan_objmgr_peer *wlan_vdev_get_bsspeer( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_objmgr.bss_peer; } @@ -1355,7 +1320,6 @@ static inline struct wlan_objmgr_peer *wlan_vdev_get_bsspeer( static inline struct vdev_osif_priv *wlan_vdev_get_ospriv( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_nif.osdev; } @@ -1369,7 +1333,6 @@ static inline struct vdev_osif_priv *wlan_vdev_get_ospriv( */ static inline void wlan_vdev_reset_ospriv(struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_nif.osdev = NULL; } @@ -1383,7 +1346,6 @@ static inline void wlan_vdev_reset_ospriv(struct wlan_objmgr_vdev *vdev) */ static inline uint16_t wlan_vdev_get_peer_count(struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_objmgr.wlan_peer_count; } @@ -1467,7 +1429,6 @@ void wlan_objmgr_vdev_release_ref(struct wlan_objmgr_vdev *vdev, static inline void wlan_vdev_set_max_peer_count(struct wlan_objmgr_vdev *vdev, uint16_t count) { - /* This API is invoked with lock acquired, do not add log prints */ vdev->vdev_objmgr.max_peer_count = count; } @@ -1482,7 +1443,6 @@ static inline void wlan_vdev_set_max_peer_count(struct wlan_objmgr_vdev *vdev, static inline uint16_t wlan_vdev_get_max_peer_count( struct wlan_objmgr_vdev *vdev) { - /* This API is invoked with lock acquired, do not add log prints */ return vdev->vdev_objmgr.max_peer_count; } #endif /* _WLAN_OBJMGR_VDEV_OBJ_H_*/ 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 28dfdc0078..caa0c1c9a0 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 @@ -537,8 +537,6 @@ void *wlan_objmgr_peer_get_comp_private_obj( { void *comp_priv_obj; - /* This API is invoked with lock acquired, don't add any debug prints */ - /* component id is invalid */ if (id >= WLAN_UMAC_MAX_COMPONENTS) { QDF_BUG(0); diff --git a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c index f614a1c4e0..1b64f22c45 100644 --- a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c +++ b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c @@ -2448,9 +2448,7 @@ bool policy_mgr_is_dnsc_set(struct wlan_objmgr_vdev *vdev) return false; } - wlan_vdev_obj_lock(vdev); roffchan = wlan_vdev_mlme_cap_get(vdev, WLAN_VDEV_C_RESTRICT_OFFCHAN); - wlan_vdev_obj_unlock(vdev); policy_mgr_debug("Restrict offchannel:%s", roffchan ? "set" : "clear"); diff --git a/umac/nan/core/src/nan_main.c b/umac/nan/core/src/nan_main.c index 219e509968..9c11a809b2 100644 --- a/umac/nan/core/src/nan_main.c +++ b/umac/nan/core/src/nan_main.c @@ -41,9 +41,7 @@ struct nan_vdev_priv_obj *nan_get_vdev_priv_obj( nan_err("vdev is null"); return NULL; } - wlan_vdev_obj_lock(vdev); obj = wlan_objmgr_vdev_get_comp_private_obj(vdev, WLAN_UMAC_COMP_NAN); - wlan_vdev_obj_unlock(vdev); return obj; } diff --git a/umac/p2p/core/src/wlan_p2p_main.c b/umac/p2p/core/src/wlan_p2p_main.c index 9084c75bf2..bce6afc5fe 100644 --- a/umac/p2p/core/src/wlan_p2p_main.c +++ b/umac/p2p/core/src/wlan_p2p_main.c @@ -194,9 +194,7 @@ static QDF_STATUS p2p_vdev_obj_create_notification( return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); mode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); p2p_debug("vdev mode:%d", mode); if (mode != QDF_P2P_GO_MODE) { p2p_debug("won't create p2p vdev private object if it is not GO"); @@ -251,9 +249,7 @@ static QDF_STATUS p2p_vdev_obj_destroy_notification( return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); mode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); p2p_debug("vdev mode:%d", mode); if (mode != QDF_P2P_GO_MODE) { p2p_debug("no p2p vdev private object if it is not GO"); @@ -310,19 +306,13 @@ static QDF_STATUS p2p_peer_obj_create_notification( return QDF_STATUS_E_INVAL; } - wlan_peer_obj_lock(peer); vdev = wlan_peer_get_vdev(peer); - wlan_peer_obj_unlock(peer); p2p_vdev_obj = wlan_objmgr_vdev_get_comp_private_obj(vdev, WLAN_UMAC_COMP_P2P); - wlan_peer_obj_lock(peer); peer_type = wlan_peer_get_peer_type(peer); - wlan_peer_obj_unlock(peer); if ((peer_type == WLAN_PEER_STA) && p2p_vdev_obj) { - wlan_vdev_obj_lock(vdev); mode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); if (mode == QDF_P2P_GO_MODE) { p2p_vdev_obj->non_p2p_peer_count++; p2p_debug("Non P2P peer count: %d", @@ -359,26 +349,18 @@ static QDF_STATUS p2p_peer_obj_destroy_notification( return QDF_STATUS_E_INVAL; } - wlan_peer_obj_lock(peer); vdev = wlan_peer_get_vdev(peer); - wlan_peer_obj_unlock(peer); p2p_vdev_obj = wlan_objmgr_vdev_get_comp_private_obj(vdev, WLAN_UMAC_COMP_P2P); - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); if (!p2p_vdev_obj || !psoc) { p2p_err("p2p_vdev_obj:%p psoc:%p", p2p_vdev_obj, psoc); return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); mode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); - wlan_peer_obj_lock(peer); peer_type = wlan_peer_get_peer_type(peer); - wlan_peer_obj_unlock(peer); if ((peer_type == WLAN_PEER_STA) && (mode == QDF_P2P_GO_MODE)) { @@ -387,9 +369,7 @@ static QDF_STATUS p2p_peer_obj_destroy_notification( if (!p2p_vdev_obj->non_p2p_peer_count && (p2p_vdev_obj->noa_status == false)) { - wlan_vdev_obj_lock(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (ucfg_p2p_set_noa(psoc, vdev_id, false) == QDF_STATUS_SUCCESS) @@ -502,13 +482,9 @@ static QDF_STATUS process_peer_for_noa(struct wlan_objmgr_vdev *vdev, p2p_err("p2p_vdev_obj:%p", p2p_vdev_obj); return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); mode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); - wlan_peer_obj_lock(peer); peer_type = wlan_peer_get_peer_type(peer); - wlan_peer_obj_unlock(peer); disable_noa = ((mode == QDF_P2P_GO_MODE) && p2p_vdev_obj->non_p2p_peer_count @@ -516,9 +492,7 @@ static QDF_STATUS process_peer_for_noa(struct wlan_objmgr_vdev *vdev, if (disable_noa && (peer_type == WLAN_PEER_STA)) { - wlan_vdev_obj_lock(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (ucfg_p2p_set_noa(psoc, vdev_id, true) == QDF_STATUS_SUCCESS) { @@ -987,9 +961,7 @@ QDF_STATUS p2p_process_noa(struct p2p_noa_event *noa_event) return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); mode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); p2p_debug("vdev mode:%d", mode); if (mode != QDF_P2P_GO_MODE) { p2p_err("invalid p2p vdev mode:%d", mode); @@ -1030,9 +1002,7 @@ void p2p_peer_authorized(struct wlan_objmgr_vdev *vdev, uint8_t *mac_addr) p2p_err("vdev:%p", vdev); return; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { p2p_err("psoc:%p", psoc); return; diff --git a/umac/p2p/core/src/wlan_p2p_off_chan_tx.c b/umac/p2p/core/src/wlan_p2p_off_chan_tx.c index 3831efb029..924c384b47 100644 --- a/umac/p2p/core/src/wlan_p2p_off_chan_tx.c +++ b/umac/p2p/core/src/wlan_p2p_off_chan_tx.c @@ -95,9 +95,7 @@ static QDF_STATUS p2p_vdev_check_valid(struct tx_action_context *tx_ctx) return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); mode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); p2p_debug("vdev mode:%d", mode); /* drop probe response for sta, go, sap */ @@ -272,9 +270,7 @@ static struct p2p_noa_info *p2p_get_vdev_noa_info( return NULL; } - wlan_vdev_obj_lock(vdev); mode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); p2p_debug("vdev mode:%d", mode); if (mode != QDF_P2P_GO_MODE) { p2p_debug("invalid p2p vdev mode:%d", mode); diff --git a/umac/p2p/dispatcher/src/wlan_p2p_tgt_api.c b/umac/p2p/dispatcher/src/wlan_p2p_tgt_api.c index 3756a8d733..92764d72bc 100644 --- a/umac/p2p/dispatcher/src/wlan_p2p_tgt_api.c +++ b/umac/p2p/dispatcher/src/wlan_p2p_tgt_api.c @@ -207,16 +207,12 @@ QDF_STATUS tgt_p2p_mgmt_frame_rx_cb(struct wlan_objmgr_psoc *psoc, vdev_id = roc_ctx->vdev_id; } } else { - wlan_peer_obj_lock(peer); vdev = wlan_peer_get_vdev(peer); - wlan_peer_obj_unlock(peer); if (!vdev) { p2p_err("vdev is NULL in peer, drop this frame"); return QDF_STATUS_E_FAILURE; } - wlan_vdev_obj_lock(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); } rx_mgmt_event = qdf_mem_malloc(sizeof(*rx_mgmt_event)); diff --git a/umac/p2p/dispatcher/src/wlan_p2p_ucfg_api.c b/umac/p2p/dispatcher/src/wlan_p2p_ucfg_api.c index 2ab8046b0c..c8d791b235 100644 --- a/umac/p2p/dispatcher/src/wlan_p2p_ucfg_api.c +++ b/umac/p2p/dispatcher/src/wlan_p2p_ucfg_api.c @@ -203,10 +203,8 @@ QDF_STATUS ucfg_p2p_cleanup_roc(struct wlan_objmgr_vdev *vdev) return QDF_STATUS_E_INVAL; } - wlan_vdev_obj_lock(vdev); vdev_id = (uint32_t)wlan_vdev_get_id(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { p2p_err("null psoc"); return QDF_STATUS_E_INVAL; diff --git a/umac/regulatory/core/src/reg_services.c b/umac/regulatory/core/src/reg_services.c index 0b3e5374f3..73f2d2633b 100644 --- a/umac/regulatory/core/src/reg_services.c +++ b/umac/regulatory/core/src/reg_services.c @@ -2365,9 +2365,7 @@ QDF_STATUS reg_11d_vdev_created_update(struct wlan_objmgr_vdev *vdev) enum tQDF_ADAPTER_MODE op_mode; uint8_t i; - wlan_vdev_obj_lock(vdev); op_mode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); parent_pdev = wlan_vdev_get_pdev(vdev); parent_psoc = wlan_pdev_get_psoc(parent_pdev); @@ -2427,9 +2425,7 @@ QDF_STATUS reg_11d_vdev_delete_update(struct wlan_objmgr_vdev *vdev) uint32_t vdev_id; uint8_t i; - wlan_vdev_obj_lock(vdev); op_mode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); parent_pdev = wlan_vdev_get_pdev(vdev); parent_psoc = wlan_pdev_get_psoc(parent_pdev); diff --git a/umac/scan/core/src/wlan_scan_main.c b/umac/scan/core/src/wlan_scan_main.c index abd480c1d5..a4d2d3f960 100644 --- a/umac/scan/core/src/wlan_scan_main.c +++ b/umac/scan/core/src/wlan_scan_main.c @@ -105,10 +105,8 @@ QDF_STATUS wlan_scan_vdev_destroyed_notification( void *scan_vdev_obj = NULL; QDF_STATUS status = QDF_STATUS_SUCCESS; - wlan_vdev_obj_lock(vdev); scan_vdev_obj = wlan_objmgr_vdev_get_comp_private_obj(vdev, WLAN_UMAC_COMP_SCAN); - wlan_vdev_obj_unlock(vdev); if (!scan_vdev_obj) { scm_err("Failed to detach scan in vdev ctx"); diff --git a/umac/scan/core/src/wlan_scan_main.h b/umac/scan/core/src/wlan_scan_main.h index b2c4514746..017e243d82 100644 --- a/umac/scan/core/src/wlan_scan_main.h +++ b/umac/scan/core/src/wlan_scan_main.h @@ -408,9 +408,7 @@ wlan_vdev_get_scan_obj(struct wlan_objmgr_vdev *vdev) { struct wlan_objmgr_pdev *pdev; - wlan_vdev_obj_lock(vdev); pdev = wlan_vdev_get_pdev(vdev); - wlan_vdev_obj_unlock(vdev); return wlan_pdev_get_scan_obj(pdev); } @@ -426,11 +424,9 @@ wlan_get_vdev_scan_obj(struct wlan_objmgr_vdev *vdev) { struct scan_vdev_obj *scan_vdev_obj; - wlan_vdev_obj_lock(vdev); scan_vdev_obj = (struct scan_vdev_obj *) wlan_objmgr_vdev_get_comp_private_obj(vdev, WLAN_UMAC_COMP_SCAN); - wlan_vdev_obj_unlock(vdev); return scan_vdev_obj; } @@ -446,9 +442,7 @@ wlan_scan_vdev_get_pdev_id(struct wlan_objmgr_vdev *vdev) { struct wlan_objmgr_pdev *pdev; - wlan_vdev_obj_lock(vdev); pdev = wlan_vdev_get_pdev(vdev); - wlan_vdev_obj_unlock(vdev); return wlan_objmgr_pdev_get_pdev_id(pdev); } @@ -489,9 +483,7 @@ wlan_vdev_get_pdev_scan_ev_handlers(struct wlan_objmgr_vdev *vdev) { struct wlan_objmgr_pdev *pdev; - wlan_vdev_obj_lock(vdev); pdev = wlan_vdev_get_pdev(vdev); - wlan_vdev_obj_unlock(vdev); return wlan_pdev_get_pdev_scan_ev_handlers(pdev); } @@ -534,9 +526,7 @@ wlan_vdev_get_def_scan_params(struct wlan_objmgr_vdev *vdev) scm_err("null vdev"); return NULL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); return wlan_scan_psoc_get_def_params(psoc); } diff --git a/umac/scan/core/src/wlan_scan_manager.c b/umac/scan/core/src/wlan_scan_manager.c index 7d84c7e89a..d10478a9fc 100644 --- a/umac/scan/core/src/wlan_scan_manager.c +++ b/umac/scan/core/src/wlan_scan_manager.c @@ -364,9 +364,7 @@ scm_scan_start_req(struct scheduler_msg *msg) SCAN_TIMEOUT_GRACE_PERIOD; cmd.vdev = req->vdev; - wlan_vdev_obj_lock(cmd.vdev); psoc = wlan_vdev_get_psoc(cmd.vdev); - wlan_vdev_obj_unlock(cmd.vdev); /* * Temp Hack to disable Serialization Timer * Modified Serialization module to ignore timeout of 0 value diff --git a/umac/scan/dispatcher/src/wlan_scan_tgt_api.c b/umac/scan/dispatcher/src/wlan_scan_tgt_api.c index 37931eb355..7fcd122c01 100644 --- a/umac/scan/dispatcher/src/wlan_scan_tgt_api.c +++ b/umac/scan/dispatcher/src/wlan_scan_tgt_api.c @@ -44,9 +44,7 @@ wlan_vdev_get_scan_txops(struct wlan_objmgr_vdev *vdev) { struct wlan_objmgr_psoc *psoc = NULL; - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); return wlan_psoc_get_scan_txops(psoc); } @@ -56,9 +54,7 @@ wlan_vdev_get_scan_rxops(struct wlan_objmgr_vdev *vdev) { struct wlan_objmgr_psoc *psoc = NULL; - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); return &((psoc->soc_cb.rx_ops.scan)); } @@ -71,9 +67,7 @@ QDF_STATUS tgt_scan_pno_start(struct wlan_objmgr_vdev *vdev, struct wlan_lmac_if_scan_tx_ops *scan_ops; struct wlan_objmgr_psoc *psoc; - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); scan_ops = wlan_psoc_get_scan_txops(psoc); /* invoke wmi_unified_pno_start_cmd() */ @@ -90,9 +84,7 @@ QDF_STATUS tgt_scan_pno_stop(struct wlan_objmgr_vdev *vdev, struct wlan_lmac_if_scan_tx_ops *scan_ops; struct wlan_objmgr_psoc *psoc; - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); scan_ops = wlan_psoc_get_scan_txops(psoc); /* invoke wmi_unified_pno_stop_cmd() */ @@ -111,9 +103,7 @@ tgt_scan_start(struct scan_start_request *req) struct wlan_objmgr_psoc *psoc; struct wlan_objmgr_vdev *vdev = req->vdev; - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); scan_ops = wlan_psoc_get_scan_txops(psoc); /* invoke wmi_unified_scan_start_cmd_send() */ @@ -132,9 +122,7 @@ tgt_scan_cancel(struct scan_cancel_request *req) struct wlan_objmgr_psoc *psoc; struct wlan_objmgr_vdev *vdev = req->vdev; - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); scan_ops = wlan_psoc_get_scan_txops(psoc); /* invoke wmi_unified_scan_stop_cmd_send() */ diff --git a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c index 82ebf8e373..a4c7bc93f3 100644 --- a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c +++ b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c @@ -445,9 +445,7 @@ ucfg_scan_cancel_sync(struct scan_cancel_request *req) qdf_event_reset(&cancel_scan_event); if (cancel_pdev) { - wlan_vdev_obj_lock(vdev); pdev = wlan_vdev_get_pdev(vdev); - wlan_vdev_obj_unlock(vdev); while ((ucfg_scan_get_pdev_status(pdev) != SCAN_NOT_IN_PROGRESS) && max_wait_iterations) { scm_debug("wait for all pdev scan to get complete"); diff --git a/umac/tdls/core/src/wlan_tdls_cmds_process.c b/umac/tdls/core/src/wlan_tdls_cmds_process.c index 80a7ef3873..671eaf03c0 100644 --- a/umac/tdls/core/src/wlan_tdls_cmds_process.c +++ b/umac/tdls/core/src/wlan_tdls_cmds_process.c @@ -142,16 +142,13 @@ static QDF_STATUS tdls_pe_add_peer(struct tdls_add_peer_request *req) addstareq->tdls_oper = TDLS_OPER_ADD; addstareq->transaction_id = 0; - wlan_vdev_obj_lock(vdev); addstareq->session_id = wlan_vdev_get_id(vdev); peer = wlan_vdev_get_bsspeer(vdev); if (!peer) { - wlan_vdev_obj_unlock(vdev); tdls_err("bss peer is NULL"); status = QDF_STATUS_E_INVAL; goto error; } - wlan_vdev_obj_unlock(vdev); status = wlan_objmgr_peer_try_get_ref(peer, WLAN_TDLS_NB_ID); if (QDF_IS_STATUS_ERROR(status)) { tdls_err("can't get bss peer"); @@ -210,16 +207,13 @@ QDF_STATUS tdls_pe_del_peer(struct tdls_del_peer_request *req) delstareq->transaction_id = 0; - wlan_vdev_obj_lock(vdev); delstareq->session_id = wlan_vdev_get_id(vdev); peer = wlan_vdev_get_bsspeer(vdev); if (!peer) { - wlan_vdev_obj_unlock(vdev); tdls_err("bss peer is NULL"); status = QDF_STATUS_E_INVAL; goto error; } - wlan_vdev_obj_unlock(vdev); status = wlan_objmgr_peer_try_get_ref(peer, WLAN_TDLS_NB_ID); if (QDF_IS_STATUS_ERROR(status)) { tdls_err("can't get bss peer"); @@ -281,16 +275,13 @@ static QDF_STATUS tdls_pe_update_peer(struct tdls_update_peer_request *req) addstareq->tdls_oper = TDLS_OPER_UPDATE; addstareq->transaction_id = 0; - wlan_vdev_obj_lock(vdev); addstareq->session_id = wlan_vdev_get_id(vdev); peer = wlan_vdev_get_bsspeer(vdev); if (!peer) { - wlan_vdev_obj_unlock(vdev); tdls_err("bss peer is NULL"); status = QDF_STATUS_E_INVAL; goto error; } - wlan_vdev_obj_unlock(vdev); status = wlan_objmgr_peer_try_get_ref(peer, WLAN_TDLS_NB_ID); if (QDF_IS_STATUS_ERROR(status)) { tdls_err("can't get bss peer"); @@ -1477,9 +1468,7 @@ QDF_STATUS tdls_process_del_peer_rsp(struct tdls_del_sta_rsp *rsp) QDF_MAC_ADDR_ARRAY(macaddr), curr_peer->link_status); - wlan_vdev_obj_lock(vdev); id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); if (TDLS_IS_LINK_CONNECTED(curr_peer)) { soc_obj->tdls_dereg_tl_peer( @@ -1573,14 +1562,13 @@ tdls_update_uapsd(struct wlan_objmgr_psoc *psoc, struct wlan_objmgr_vdev *vdev, tdls_debug("No need to configure auto trigger:psb is 0"); return QDF_STATUS_SUCCESS; } - wlan_vdev_obj_lock(vdev); vdev_id = wlan_vdev_get_id(vdev); bsspeer = wlan_vdev_get_bsspeer(vdev); if (!bsspeer) { - wlan_vdev_obj_unlock(vdev); tdls_err("bss peer is NULL"); return QDF_STATUS_E_FAILURE; } + wlan_vdev_obj_lock(vdev); qdf_mem_copy(macaddr, wlan_peer_get_macaddr(bsspeer), QDF_MAC_ADDR_SIZE); wlan_vdev_obj_unlock(vdev); @@ -1663,9 +1651,7 @@ QDF_STATUS tdls_process_enable_link(struct tdls_oper_request *req) tdls_set_peer_link_status(peer, TDLS_LINK_CONNECTED, TDLS_LINK_SUCCESS); - wlan_vdev_obj_lock(vdev); id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); status = soc_obj->tdls_reg_tl_peer(soc_obj->tdls_tl_peer_data, id, mac, peer->sta_id, peer->signature, peer->qos); @@ -1744,9 +1730,7 @@ static QDF_STATUS tdls_config_force_peer( QDF_MAC_ADDR_ARRAY(macaddr)); vdev = req->vdev; - wlan_vdev_obj_lock(vdev); pdev = wlan_vdev_get_pdev(vdev); - wlan_vdev_obj_unlock(vdev); vdev_obj = wlan_vdev_get_tdls_vdev_obj(vdev); soc_obj = wlan_vdev_get_tdls_soc_obj(vdev); if (!pdev || !vdev_obj || !soc_obj) { @@ -1784,9 +1768,7 @@ static QDF_STATUS tdls_config_force_peer( /* Update the peer mac to firmware, so firmware could update the * connection table */ - wlan_vdev_obj_lock(vdev); peer_update_param->vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); qdf_mem_copy(peer_update_param->peer_macaddr, macaddr, QDF_MAC_ADDR_SIZE); peer_update_param->peer_state = TDLS_PEER_ADD_MAC_ADDR; @@ -1951,9 +1933,7 @@ QDF_STATUS tdls_process_remove_force_peer(struct tdls_oper_request *req) goto error; } - wlan_vdev_obj_lock(vdev); peer_update_param->vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); qdf_mem_copy(peer_update_param->peer_macaddr, macaddr, QDF_MAC_ADDR_SIZE); peer_update_param->peer_state = TDLS_PEER_REMOVE_MAC_ADDR; diff --git a/umac/tdls/core/src/wlan_tdls_ct.c b/umac/tdls/core/src/wlan_tdls_ct.c index d6e73f6974..1ed20b976f 100644 --- a/umac/tdls/core/src/wlan_tdls_ct.c +++ b/umac/tdls/core/src/wlan_tdls_ct.c @@ -32,18 +32,14 @@ bool tdls_is_vdev_connected(struct wlan_objmgr_vdev *vdev) struct wlan_objmgr_peer *peer; enum wlan_peer_state peer_state; - wlan_vdev_obj_lock(vdev); peer = wlan_vdev_get_bsspeer(vdev); - wlan_vdev_obj_unlock(vdev); if (!peer) { tdls_err("peer is null"); return false; } - wlan_peer_obj_lock(peer); peer_state = wlan_peer_mlme_get_state(peer); - wlan_peer_obj_unlock(peer); if (peer_state != WLAN_ASSOC_STATE) { tdls_err("peer state: %d", peer_state); @@ -58,18 +54,14 @@ bool tdls_is_vdev_authenticated(struct wlan_objmgr_vdev *vdev) struct wlan_objmgr_peer *peer; bool is_authenticated = false; - wlan_vdev_obj_lock(vdev); peer = wlan_vdev_get_bsspeer(vdev); - wlan_vdev_obj_unlock(vdev); if (!peer) { tdls_err("peer is null"); return false; } - wlan_peer_obj_lock(peer); is_authenticated = wlan_peer_mlme_get_auth_state(peer); - wlan_peer_obj_unlock(peer); return is_authenticated; } diff --git a/umac/tdls/core/src/wlan_tdls_main.c b/umac/tdls/core/src/wlan_tdls_main.c index 437b51f5fc..5ce0596f0e 100644 --- a/umac/tdls/core/src/wlan_tdls_main.c +++ b/umac/tdls/core/src/wlan_tdls_main.c @@ -430,9 +430,7 @@ QDF_STATUS tdls_get_vdev_objects(struct wlan_objmgr_vdev *vdev, if (NULL == (*tdls_soc_obj)) return QDF_STATUS_E_FAILURE; - wlan_vdev_obj_lock(vdev); device_mode = wlan_vdev_mlme_get_opmode(vdev); - wlan_vdev_obj_unlock(vdev); if (device_mode != QDF_STA_MODE && device_mode != QDF_P2P_CLIENT_MODE) diff --git a/umac/tdls/core/src/wlan_tdls_main.h b/umac/tdls/core/src/wlan_tdls_main.h index 0f699f319c..f9f657a605 100644 --- a/umac/tdls/core/src/wlan_tdls_main.h +++ b/umac/tdls/core/src/wlan_tdls_main.h @@ -375,9 +375,7 @@ wlan_vdev_get_tdls_soc_obj(struct wlan_objmgr_vdev *vdev) return NULL; } - wlan_vdev_obj_lock(vdev); psoc = wlan_vdev_get_psoc(vdev); - wlan_vdev_obj_unlock(vdev); if (!psoc) { tdls_err("can't get psoc"); return NULL; @@ -427,11 +425,9 @@ wlan_vdev_get_tdls_vdev_obj(struct wlan_objmgr_vdev *vdev) return NULL; } - wlan_vdev_obj_lock(vdev); vdev_obj = (struct tdls_vdev_priv_obj *) wlan_objmgr_vdev_get_comp_private_obj(vdev, WLAN_UMAC_COMP_TDLS); - wlan_vdev_obj_unlock(vdev); return vdev_obj; } diff --git a/umac/tdls/core/src/wlan_tdls_peer.c b/umac/tdls/core/src/wlan_tdls_peer.c index 56e5ec715e..c78f0f0f35 100644 --- a/umac/tdls/core/src/wlan_tdls_peer.c +++ b/umac/tdls/core/src/wlan_tdls_peer.c @@ -315,9 +315,7 @@ struct tdls_peer *tdls_is_progress(struct tdls_vdev_priv_obj *vdev_obj, return NULL; } - wlan_vdev_obj_lock(vdev_obj->vdev); psoc = wlan_vdev_get_psoc(vdev_obj->vdev); - wlan_vdev_obj_unlock(vdev_obj->vdev); if (!psoc) { tdls_err("invalid psoc"); return NULL; @@ -395,10 +393,8 @@ static void tdls_determine_channel_opclass(struct tdls_soc_priv_obj *soc_obj, if (!(TDLS_IS_OFF_CHANNEL_ENABLED( soc_obj->tdls_configs.tdls_feature_flags)) || soc_obj->tdls_fw_off_chan_mode != ENABLE_CHANSWITCH) { - wlan_vdev_obj_lock(vdev_obj->vdev); vdev_id = wlan_vdev_get_id(vdev_obj->vdev); opmode = wlan_vdev_mlme_get_opmode(vdev_obj->vdev); - wlan_vdev_obj_unlock(vdev_obj->vdev); *channel = policy_mgr_get_channel(soc_obj->soc, opmode, &vdev_id); @@ -482,9 +478,7 @@ void tdls_extract_peer_state_param(struct tdls_peer_update_state *peer_param, } qdf_mem_zero(peer_param, sizeof(*peer_param)); - wlan_vdev_obj_lock(vdev_obj->vdev); peer_param->vdev_id = wlan_vdev_get_id(vdev_obj->vdev); - wlan_vdev_obj_unlock(vdev_obj->vdev); qdf_mem_copy(peer_param->peer_macaddr, peer->peer_mac.bytes, QDF_MAC_ADDR_SIZE); diff --git a/umac/tdls/dispatcher/src/wlan_tdls_tgt_api.c b/umac/tdls/dispatcher/src/wlan_tdls_tgt_api.c index c292ac1fea..e1ab734fcc 100644 --- a/umac/tdls/dispatcher/src/wlan_tdls_tgt_api.c +++ b/umac/tdls/dispatcher/src/wlan_tdls_tgt_api.c @@ -244,21 +244,15 @@ QDF_STATUS tgt_tdls_mgmt_frame_process_rx_cb( tdls_err("current tdls vdev is null, can't get vdev id"); return QDF_STATUS_E_FAILURE; } - wlan_vdev_obj_lock(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); wlan_objmgr_vdev_release_ref(vdev, WLAN_TDLS_SB_ID); } else { - wlan_peer_obj_lock(peer); vdev = wlan_peer_get_vdev(peer); - wlan_peer_obj_unlock(peer); if (!vdev) { tdls_err("vdev is NULL in peer, drop this frame"); return QDF_STATUS_E_FAILURE; } - wlan_vdev_obj_lock(vdev); vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); } rx_mgmt_event = qdf_mem_malloc(sizeof(*rx_mgmt_event)); diff --git a/umac/wifi_pos/src/wifi_pos_main.c b/umac/wifi_pos/src/wifi_pos_main.c index 3feef52a09..0566d3dced 100644 --- a/umac/wifi_pos/src/wifi_pos_main.c +++ b/umac/wifi_pos/src/wifi_pos_main.c @@ -256,10 +256,8 @@ static void wifi_pos_populate_vdev_info(struct wlan_objmgr_psoc *psoc, { struct app_reg_rsp_vdev_info *vdev_info = arg; - wlan_vdev_obj_lock(vdev); vdev_info[vdev_idx].dev_mode = wlan_vdev_mlme_get_opmode(vdev); vdev_info[vdev_idx].vdev_id = wlan_vdev_get_id(vdev); - wlan_vdev_obj_unlock(vdev); vdev_idx++; }