From 245f447a244de8e5f91c30c1d3380292406cb4e1 Mon Sep 17 00:00:00 2001 From: Vivek Date: Wed, 21 Jun 2017 08:21:58 +0530 Subject: [PATCH] qcacmn: Remove vdev/peer locks for trivial APIs Remove vdev/peer locks from trivial API's. This follows the changes from which the lock requirement from few simple APIs are removed. Change-Id: I9972d51dfd1a42bdedbfd0fd4e67af03d030a1f5 CRs-Fixed: 2060880 --- core/src/wlan_p2p_main.c | 30 ------------------------------ core/src/wlan_p2p_off_chan_tx.c | 4 ---- dispatcher/src/wlan_p2p_tgt_api.c | 4 ---- dispatcher/src/wlan_p2p_ucfg_api.c | 2 -- 4 files changed, 40 deletions(-) diff --git a/core/src/wlan_p2p_main.c b/core/src/wlan_p2p_main.c index 9084c75bf2a5..bce6afc5fe1a 100644 --- a/core/src/wlan_p2p_main.c +++ b/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/core/src/wlan_p2p_off_chan_tx.c b/core/src/wlan_p2p_off_chan_tx.c index 3831efb029ab..924c384b47d2 100644 --- a/core/src/wlan_p2p_off_chan_tx.c +++ b/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/dispatcher/src/wlan_p2p_tgt_api.c b/dispatcher/src/wlan_p2p_tgt_api.c index 3756a8d733d5..92764d72bc7c 100644 --- a/dispatcher/src/wlan_p2p_tgt_api.c +++ b/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/dispatcher/src/wlan_p2p_ucfg_api.c b/dispatcher/src/wlan_p2p_ucfg_api.c index 2ab8046b0c94..c8d791b23540 100644 --- a/dispatcher/src/wlan_p2p_ucfg_api.c +++ b/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;