diff --git a/os_if/linux/scan/src/wlan_cfg80211_scan.c b/os_if/linux/scan/src/wlan_cfg80211_scan.c index 414fbf3f06..8d1da79d5c 100644 --- a/os_if/linux/scan/src/wlan_cfg80211_scan.c +++ b/os_if/linux/scan/src/wlan_cfg80211_scan.c @@ -79,7 +79,7 @@ static void wlan_fill_scan_rand_attrs(struct wlan_objmgr_vdev *vdev, if (wlan_vdev_mlme_get_opmode(vdev) != QDF_STA_MODE) return; - if (wlan_vdev_is_connected(vdev)) + if (wlan_vdev_is_up(vdev) == QDF_STATUS_SUCCESS) return; *randomize = true; 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 2e8d892725..9bee444aed 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 @@ -1531,14 +1531,6 @@ static inline uint16_t wlan_vdev_get_max_peer_count( return vdev->vdev_objmgr.max_peer_count; } -/** - * wlan_vdev_is_connected() - Check whether peer is associated or not - * @vdev: pointer to objmgr vdev - * - * Return: true in case success else false - */ -bool wlan_vdev_is_connected(struct wlan_objmgr_vdev *vdev); - /** * wlan_vdev_set_dp_handle() - set dp handle * @vdev: vdev object pointer diff --git a/umac/cmn_services/obj_mgr/src/wlan_objmgr_vdev_obj.c b/umac/cmn_services/obj_mgr/src/wlan_objmgr_vdev_obj.c index 94407cec6a..c9e203660c 100644 --- a/umac/cmn_services/obj_mgr/src/wlan_objmgr_vdev_obj.c +++ b/umac/cmn_services/obj_mgr/src/wlan_objmgr_vdev_obj.c @@ -869,29 +869,6 @@ void wlan_objmgr_vdev_release_ref(struct wlan_objmgr_vdev *vdev, } qdf_export_symbol(wlan_objmgr_vdev_release_ref); -bool wlan_vdev_is_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) - 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) - return false; - - return true; -} -qdf_export_symbol(wlan_vdev_is_connected); - struct wlan_objmgr_vdev *wlan_pdev_vdev_list_peek_active_head( struct wlan_objmgr_pdev *pdev, qdf_list_t *vdev_list, wlan_objmgr_ref_dbgid dbg_id) diff --git a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c index 950abd5b47..8c4d7d4173 100644 --- a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c +++ b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c @@ -1786,7 +1786,7 @@ bool ucfg_ie_whitelist_enabled(struct wlan_objmgr_psoc *psoc, return false; if ((wlan_vdev_mlme_get_opmode(vdev) != QDF_STA_MODE) || - wlan_vdev_is_connected(vdev)) + wlan_vdev_is_up(vdev) == QDF_STATUS_SUCCESS) return false; if (!scan_obj->ie_whitelist.white_list)