From ec000076472a1672f2cc0c8522a712d3a349eceb Mon Sep 17 00:00:00 2001 From: Abhishek Ambure Date: Fri, 3 May 2019 12:38:42 +0530 Subject: [PATCH] qcacld-3.0: Rename mlme log macros MLME log macros like mlme_debug, mlme_err, mlme_info are having same definition in legacy and common code. To avoid this redefination, lagacy MLME log macros are renamed. Change-Id: I71fbbcd1f74df73e82b799b318a9e9a95a3cb0c8 CRs-Fixed: 2446535 --- components/mlme/core/inc/wlan_mlme_main.h | 14 +-- components/mlme/core/src/wlan_mlme_main.c | 72 +++++++------- .../core/src/wlan_mlme_vdev_mgr_interface.c | 96 ++++++++++++------- .../mlme/dispatcher/src/wlan_mlme_api.c | 80 ++++++++-------- .../mlme/dispatcher/src/wlan_mlme_ucfg_api.c | 60 ++++++------ 5 files changed, 174 insertions(+), 148 deletions(-) diff --git a/components/mlme/core/inc/wlan_mlme_main.h b/components/mlme/core/inc/wlan_mlme_main.h index 399c9726f0..42af8e979a 100644 --- a/components/mlme/core/inc/wlan_mlme_main.h +++ b/components/mlme/core/inc/wlan_mlme_main.h @@ -29,11 +29,11 @@ #include #include -#define mlme_fatal(params...) QDF_TRACE_FATAL(QDF_MODULE_ID_MLME, params) -#define mlme_err(params...) QDF_TRACE_ERROR(QDF_MODULE_ID_MLME, params) -#define mlme_warn(params...) QDF_TRACE_WARN(QDF_MODULE_ID_MLME, params) -#define mlme_info(params...) QDF_TRACE_INFO(QDF_MODULE_ID_MLME, params) -#define mlme_debug(params...) QDF_TRACE_DEBUG(QDF_MODULE_ID_MLME, params) +#define mlme_legacy_fatal(params...) QDF_TRACE_FATAL(QDF_MODULE_ID_MLME, params) +#define mlme_legacy_err(params...) QDF_TRACE_ERROR(QDF_MODULE_ID_MLME, params) +#define mlme_legacy_warn(params...) QDF_TRACE_WARN(QDF_MODULE_ID_MLME, params) +#define mlme_legacy_info(params...) QDF_TRACE_INFO(QDF_MODULE_ID_MLME, params) +#define mlme_legacy_debug(params...) QDF_TRACE_DEBUG(QDF_MODULE_ID_MLME, params) /** * struct wlan_mlme_psoc_obj -MLME psoc priv object @@ -146,7 +146,7 @@ void wlan_peer_set_unicast_cipher(struct wlan_objmgr_peer *peer, uint32_t value) peer_priv = wlan_objmgr_peer_get_comp_private_obj(peer, WLAN_UMAC_COMP_MLME); if (!peer_priv) { - mlme_err(" peer mlme component object is NULL"); + mlme_legacy_err(" peer mlme component object is NULL"); return; } peer_priv->ucast_key_cipher = value; @@ -166,7 +166,7 @@ uint32_t wlan_peer_get_unicast_cipher(struct wlan_objmgr_peer *peer) peer_priv = wlan_objmgr_peer_get_comp_private_obj(peer, WLAN_UMAC_COMP_MLME); if (!peer_priv) { - mlme_err("peer mlme component object is NULL"); + mlme_legacy_err("peer mlme component object is NULL"); return 0; } diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c index b8628bc0c2..1ede193cae 100644 --- a/components/mlme/core/src/wlan_mlme_main.c +++ b/components/mlme/core/src/wlan_mlme_main.c @@ -39,7 +39,7 @@ struct wlan_mlme_psoc_obj *mlme_get_psoc_obj_fl(struct wlan_objmgr_psoc *psoc, wlan_objmgr_psoc_get_comp_private_obj(psoc, WLAN_UMAC_COMP_MLME); if (!mlme_obj) - mlme_err("mlme obj is null, %s:%d", func, line); + mlme_legacy_err("mlme obj is null, %s:%d", func, line); return mlme_obj; } @@ -53,7 +53,7 @@ struct wlan_mlme_nss_chains *mlme_get_dynamic_vdev_config( vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return NULL; } @@ -70,7 +70,7 @@ struct wlan_mlme_nss_chains *mlme_get_ini_vdev_config( vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return NULL; } @@ -86,7 +86,7 @@ uint8_t *mlme_get_dynamic_oce_flags(struct wlan_objmgr_vdev *vdev) vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return NULL; } @@ -103,14 +103,14 @@ wlan_vdev_mlme_get_priv_obj(struct wlan_objmgr_vdev *vdev) struct vdev_mlme_priv_obj *vdev_mlme; if (!vdev) { - mlme_err("vdev is NULL"); + mlme_legacy_err("vdev is NULL"); return NULL; } vdev_mlme = wlan_objmgr_vdev_get_comp_private_obj(vdev, WLAN_UMAC_COMP_MLME); if (!vdev_mlme) { - mlme_err(" MLME component object is NULL"); + mlme_legacy_err(" MLME component object is NULL"); return NULL; } @@ -123,7 +123,7 @@ uint8_t *mlme_get_dynamic_oce_flags(struct wlan_objmgr_vdev *vdev) vdev_mlme = wlan_vdev_mlme_get_priv_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return NULL; } @@ -137,7 +137,7 @@ struct wlan_mlme_nss_chains *mlme_get_dynamic_vdev_config( vdev_mlme = wlan_vdev_mlme_get_priv_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return NULL; } @@ -151,7 +151,7 @@ struct wlan_mlme_nss_chains *mlme_get_ini_vdev_config( vdev_mlme = wlan_vdev_mlme_get_priv_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return NULL; } @@ -166,13 +166,13 @@ mlme_vdev_object_created_notification(struct wlan_objmgr_vdev *vdev, QDF_STATUS status; if (!vdev) { - mlme_err(" VDEV is NULL"); + mlme_legacy_err(" VDEV is NULL"); return QDF_STATUS_E_FAILURE; } vdev_mlme = qdf_mem_malloc(sizeof(*vdev_mlme)); if (!vdev_mlme) { - mlme_err(" MLME component object alloc failed"); + mlme_legacy_err(" MLME component object alloc failed"); return QDF_STATUS_E_NOMEM; } @@ -182,7 +182,7 @@ mlme_vdev_object_created_notification(struct wlan_objmgr_vdev *vdev, QDF_STATUS_SUCCESS); if (QDF_IS_STATUS_ERROR(status)) - mlme_err("unable to attach vdev priv obj to vdev obj"); + mlme_legacy_err("unable to attach vdev priv obj to vdev obj"); return QDF_STATUS_SUCCESS; } @@ -195,14 +195,14 @@ mlme_vdev_object_destroyed_notification(struct wlan_objmgr_vdev *vdev, QDF_STATUS status; if (!vdev) { - mlme_err(" VDEV is NULL"); + mlme_legacy_err(" VDEV is NULL"); return QDF_STATUS_E_FAILURE; } vdev_mlme = wlan_objmgr_vdev_get_comp_private_obj(vdev, WLAN_UMAC_COMP_MLME); if (!vdev_mlme) { - mlme_err(" VDEV MLME component object is NULL"); + mlme_legacy_err(" VDEV MLME component object is NULL"); return QDF_STATUS_E_FAILURE; } @@ -211,7 +211,7 @@ mlme_vdev_object_destroyed_notification(struct wlan_objmgr_vdev *vdev, vdev_mlme); if (QDF_IS_STATUS_ERROR(status)) - mlme_err("unable to detach vdev priv obj to vdev obj"); + mlme_legacy_err("unable to detach vdev priv obj to vdev obj"); qdf_mem_free(vdev_mlme); @@ -229,7 +229,7 @@ mlme_psoc_object_created_notification(struct wlan_objmgr_psoc *psoc, mlme_obj = qdf_mem_malloc(sizeof(struct wlan_mlme_psoc_obj)); if (!mlme_obj) { - mlme_err("Failed to allocate memory"); + mlme_legacy_err("Failed to allocate memory"); return QDF_STATUS_E_NOMEM; } @@ -238,7 +238,7 @@ mlme_psoc_object_created_notification(struct wlan_objmgr_psoc *psoc, mlme_obj, QDF_STATUS_SUCCESS); if (status != QDF_STATUS_SUCCESS) { - mlme_err("Failed to attach psoc_ctx with psoc"); + mlme_legacy_err("Failed to attach psoc_ctx with psoc"); qdf_mem_free(mlme_obj); } @@ -258,7 +258,7 @@ mlme_psoc_object_destroyed_notification(struct wlan_objmgr_psoc *psoc, WLAN_UMAC_COMP_MLME, mlme_obj); if (status != QDF_STATUS_SUCCESS) { - mlme_err("Failed to detach psoc_ctx from psoc"); + mlme_legacy_err("Failed to detach psoc_ctx from psoc"); status = QDF_STATUS_E_FAILURE; goto out; } @@ -278,14 +278,14 @@ QDF_STATUS mlme_get_peer_mic_len(struct wlan_objmgr_psoc *psoc, uint8_t pdev_id, uint32_t key_cipher; if (!psoc || !mic_len || !mic_hdr_len || !peer_mac) { - mlme_debug("psoc/mic_len/mic_hdr_len/peer_mac null"); + mlme_legacy_debug("psoc/mic_len/mic_hdr_len/peer_mac null"); return QDF_STATUS_E_NULL_VALUE; } peer = wlan_objmgr_get_peer(psoc, pdev_id, peer_mac, WLAN_LEGACY_MAC_ID); if (!peer) { - mlme_debug("Peer of peer_mac %pM not found", peer_mac); + mlme_legacy_debug("Peer of peer_mac %pM not found", peer_mac); return QDF_STATUS_E_INVAL; } @@ -302,8 +302,8 @@ QDF_STATUS mlme_get_peer_mic_len(struct wlan_objmgr_psoc *psoc, uint8_t pdev_id, *mic_hdr_len = IEEE80211_CCMP_HEADERLEN; *mic_len = IEEE80211_CCMP_MICLEN; } - mlme_debug("peer %pM hdr_len %d mic_len %d key_cipher 0x%x", peer_mac, - *mic_hdr_len, *mic_len, key_cipher); + mlme_legacy_debug("peer %pM hdr_len %d mic_len %d key_cipher 0x%x", + peer_mac, *mic_hdr_len, *mic_len, key_cipher); return QDF_STATUS_SUCCESS; } @@ -332,14 +332,14 @@ QDF_STATUS mlme_get_peer_mic_len(struct wlan_objmgr_psoc *psoc, uint8_t pdev_id, uint32_t key_cipher; if (!psoc || !mic_len || !mic_hdr_len || !peer_mac) { - mlme_debug("psoc/mic_len/mic_hdr_len/peer_mac null"); + mlme_legacy_debug("psoc/mic_len/mic_hdr_len/peer_mac null"); return QDF_STATUS_E_NULL_VALUE; } peer = wlan_objmgr_get_peer(psoc, pdev_id, peer_mac, WLAN_LEGACY_MAC_ID); if (!peer) { - mlme_debug("Peer of peer_mac %pM not found", peer_mac); + mlme_legacy_debug("Peer of peer_mac %pM not found", peer_mac); return QDF_STATUS_E_INVAL; } key_cipher = wlan_peer_get_unicast_cipher(peer); @@ -352,8 +352,8 @@ QDF_STATUS mlme_get_peer_mic_len(struct wlan_objmgr_psoc *psoc, uint8_t pdev_id, *mic_hdr_len = IEEE80211_CCMP_HEADERLEN; *mic_len = IEEE80211_CCMP_MICLEN; } - mlme_debug("peer %pM hdr_len %d mic_len %d key_cipher %d", peer_mac, - *mic_hdr_len, *mic_len, key_cipher); + mlme_legacy_debug("peer %pM hdr_len %d mic_len %d key_cipher %d", + peer_mac, *mic_hdr_len, *mic_len, key_cipher); return QDF_STATUS_SUCCESS; } @@ -366,13 +366,13 @@ mlme_peer_object_created_notification(struct wlan_objmgr_peer *peer, QDF_STATUS status; if (!peer) { - mlme_err(" peer is NULL"); + mlme_legacy_err(" peer is NULL"); return QDF_STATUS_E_FAILURE; } peer_priv = qdf_mem_malloc(sizeof(*peer_priv)); if (!peer_priv) { - mlme_err(" peer_priv component object alloc failed"); + mlme_legacy_err(" peer_priv component object alloc failed"); return QDF_STATUS_E_NOMEM; } @@ -382,7 +382,7 @@ mlme_peer_object_created_notification(struct wlan_objmgr_peer *peer, QDF_STATUS_SUCCESS); if (QDF_IS_STATUS_ERROR(status)) { - mlme_err("unable to attach peer_priv obj to peer obj"); + mlme_legacy_err("unable to attach peer_priv obj to peer obj"); qdf_mem_free(peer_priv); } @@ -397,14 +397,14 @@ mlme_peer_object_destroyed_notification(struct wlan_objmgr_peer *peer, QDF_STATUS status; if (!peer) { - mlme_err(" peer is NULL"); + mlme_legacy_err(" peer is NULL"); return QDF_STATUS_E_FAILURE; } peer_priv = wlan_objmgr_peer_get_comp_private_obj(peer, WLAN_UMAC_COMP_MLME); if (!peer_priv) { - mlme_err(" peer MLME component object is NULL"); + mlme_legacy_err(" peer MLME component object is NULL"); return QDF_STATUS_E_FAILURE; } @@ -413,7 +413,7 @@ mlme_peer_object_destroyed_notification(struct wlan_objmgr_peer *peer, peer_priv); if (QDF_IS_STATUS_ERROR(status)) - mlme_err("unable to detach peer_priv obj to peer obj"); + mlme_legacy_err("unable to detach peer_priv obj to peer obj"); qdf_mem_free(peer_priv); @@ -1901,8 +1901,8 @@ static void mlme_init_scoring_cfg(struct wlan_objmgr_psoc *psoc, * fallback to default weights */ if (total_weight > BEST_CANDIDATE_MAX_WEIGHT) { - mlme_err("Total weight greater than %d, using default weights", - BEST_CANDIDATE_MAX_WEIGHT); + mlme_legacy_err("Total weight greater than %d, using default weights", + BEST_CANDIDATE_MAX_WEIGHT); scoring_cfg->weight_cfg.rssi_weightage = RSSI_WEIGHTAGE; scoring_cfg->weight_cfg.ht_caps_weightage = HT_CAPABILITY_WEIGHTAGE; @@ -2326,7 +2326,7 @@ static void mlme_init_fe_rrm_in_cfg(struct wlan_objmgr_psoc *psoc, sizeof(rrm_config->rm_capability), &len); if (len < MLME_RMENABLEDCAP_MAX_LEN) { - mlme_debug("Incorrect RM capability, using default"); + mlme_legacy_debug("Incorrect RM capability, using default"); qdf_uint8_array_parse(cfg_default(CFG_RM_CAPABILITY), rrm_config->rm_capability, sizeof(rrm_config->rm_capability), &len); @@ -2399,7 +2399,7 @@ QDF_STATUS mlme_cfg_on_psoc_enable(struct wlan_objmgr_psoc *psoc) mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { - mlme_err("Failed to get MLME Obj"); + mlme_legacy_err("Failed to get MLME Obj"); return QDF_STATUS_E_FAILURE; } diff --git a/components/mlme/core/src/wlan_mlme_vdev_mgr_interface.c b/components/mlme/core/src/wlan_mlme_vdev_mgr_interface.c index e7425e73b3..bb0bd36b39 100644 --- a/components/mlme/core/src/wlan_mlme_vdev_mgr_interface.c +++ b/components/mlme/core/src/wlan_mlme_vdev_mgr_interface.c @@ -107,7 +107,8 @@ static QDF_STATUS sta_mlme_vdev_start_send(struct vdev_mlme_obj *vdev_mlme, uint16_t event_data_len, void *event_data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return lim_sta_mlme_vdev_start_send(vdev_mlme, event_data_len, event_data); } @@ -125,7 +126,8 @@ static QDF_STATUS sta_mlme_vdev_start_send(struct vdev_mlme_obj *vdev_mlme, static QDF_STATUS sta_mlme_start_continue(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return wma_sta_mlme_vdev_start_continue(vdev_mlme, data_len, data); } @@ -143,7 +145,8 @@ static QDF_STATUS sta_mlme_vdev_restart_send(struct vdev_mlme_obj *vdev_mlme, uint16_t event_data_len, void *event_data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return lim_sta_mlme_vdev_restart_send(vdev_mlme, event_data_len, event_data); } @@ -162,7 +165,8 @@ static QDF_STATUS sta_mlme_vdev_start_connection(struct vdev_mlme_obj *vdev_mlme uint16_t event_data_len, void *event_data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return QDF_STATUS_SUCCESS; } @@ -180,7 +184,8 @@ static QDF_STATUS sta_mlme_vdev_up_send(struct vdev_mlme_obj *vdev_mlme, uint16_t event_data_len, void *event_data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return wma_sta_vdev_up_send(vdev_mlme, event_data_len, event_data); } @@ -199,7 +204,8 @@ static QDF_STATUS sta_mlme_vdev_notify_up_complete(struct vdev_mlme_obj *vdev_ml uint16_t event_data_len, void *event_data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return QDF_STATUS_SUCCESS; } @@ -219,7 +225,8 @@ QDF_STATUS sta_mlme_vdev_notify_roam_start(struct vdev_mlme_obj *vdev_mlme, uint16_t event_data_len, void *event_data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return wma_sta_mlme_vdev_roam_notify(vdev_mlme, event_data_len, event_data); } @@ -238,7 +245,8 @@ static QDF_STATUS sta_mlme_vdev_disconnect_bss(struct vdev_mlme_obj *vdev_mlme, uint16_t event_data_len, void *event_data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return lim_sta_mlme_vdev_disconnect_bss(vdev_mlme, event_data_len, event_data); } @@ -257,7 +265,8 @@ static QDF_STATUS sta_mlme_vdev_stop_send(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return lim_sta_mlme_vdev_stop_send(vdev_mlme, data_len, data); } @@ -276,7 +285,8 @@ static QDF_STATUS vdevmgr_mlme_stop_continue(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return wma_mlme_vdev_stop_continue(vdev_mlme, data_len, data); } @@ -293,7 +303,8 @@ static QDF_STATUS vdevmgr_mlme_stop_continue(struct vdev_mlme_obj *vdev_mlme, static QDF_STATUS ap_mlme_vdev_start_send(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return lim_ap_mlme_vdev_start_send(vdev_mlme, data_len, data); } @@ -310,7 +321,8 @@ static QDF_STATUS ap_mlme_vdev_start_send(struct vdev_mlme_obj *vdev_mlme, static QDF_STATUS ap_mlme_start_continue(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return wma_ap_mlme_vdev_start_continue(vdev_mlme, data_len, data); } @@ -329,7 +341,8 @@ static QDF_STATUS ap_mlme_vdev_update_beacon(struct vdev_mlme_obj *vdev_mlme, enum beacon_update_op op, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return lim_ap_mlme_vdev_update_beacon(vdev_mlme, op, data_len, data); } @@ -346,7 +359,8 @@ static QDF_STATUS ap_mlme_vdev_update_beacon(struct vdev_mlme_obj *vdev_mlme, static QDF_STATUS ap_mlme_vdev_up_send(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return lim_ap_mlme_vdev_up_send(vdev_mlme, data_len, data); } @@ -365,7 +379,7 @@ ap_mlme_vdev_notify_up_complete(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { if (!vdev_mlme) { - mlme_err("data is NULL"); + mlme_legacy_err("data is NULL"); return QDF_STATUS_E_INVAL; } @@ -387,7 +401,8 @@ ap_mlme_vdev_notify_up_complete(struct vdev_mlme_obj *vdev_mlme, static QDF_STATUS ap_mlme_vdev_disconnect_peers(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return lim_ap_mlme_vdev_disconnect_peers(vdev_mlme, data_len, data); } @@ -404,7 +419,8 @@ static QDF_STATUS ap_mlme_vdev_disconnect_peers(struct vdev_mlme_obj *vdev_mlme, static QDF_STATUS ap_mlme_vdev_stop_send(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return lim_ap_mlme_vdev_stop_send(vdev_mlme, data_len, data); } @@ -421,7 +437,8 @@ static QDF_STATUS ap_mlme_vdev_stop_send(struct vdev_mlme_obj *vdev_mlme, static QDF_STATUS vdevmgr_mlme_vdev_down_send(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return wma_ap_mlme_vdev_down_send(vdev_mlme, data_len, data); } /** @@ -437,7 +454,8 @@ static QDF_STATUS vdevmgr_mlme_vdev_down_send(struct vdev_mlme_obj *vdev_mlme, static QDF_STATUS vdevmgr_notify_down_complete(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return wma_mlme_vdev_notify_down_complete(vdev_mlme, data_len, data); } @@ -454,7 +472,8 @@ static QDF_STATUS vdevmgr_notify_down_complete(struct vdev_mlme_obj *vdev_mlme, static QDF_STATUS ap_mlme_vdev_start_req_failed(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return lim_ap_mlme_vdev_start_req_failed(vdev_mlme, data_len, data); } @@ -471,7 +490,8 @@ static QDF_STATUS ap_mlme_vdev_start_req_failed(struct vdev_mlme_obj *vdev_mlme, static QDF_STATUS ap_mlme_vdev_restart_send(struct vdev_mlme_obj *vdev_mlme, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return lim_ap_mlme_vdev_restart_send(vdev_mlme, data_len, data); } @@ -490,7 +510,8 @@ static QDF_STATUS ap_mlme_vdev_stop_start_send(struct vdev_mlme_obj *vdev_mlme, enum vdev_cmd_type type, uint16_t data_len, void *data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return wma_ap_mlme_vdev_stop_start_send(vdev_mlme, type, data_len, data); } @@ -503,7 +524,7 @@ QDF_STATUS mlme_set_chan_switch_in_progress(struct wlan_objmgr_vdev *vdev, vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return QDF_STATUS_E_FAILURE; } @@ -521,7 +542,7 @@ bool mlme_is_chan_switch_in_progress(struct wlan_objmgr_vdev *vdev) vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return false; } @@ -539,7 +560,7 @@ ap_mlme_set_hidden_ssid_restart_in_progress(struct wlan_objmgr_vdev *vdev, vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return QDF_STATUS_E_FAILURE; } @@ -557,7 +578,7 @@ bool ap_mlme_is_hidden_ssid_restart_in_progress(struct wlan_objmgr_vdev *vdev) vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return false; } @@ -573,7 +594,7 @@ QDF_STATUS mlme_set_connection_fail(struct wlan_objmgr_vdev *vdev, bool val) vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return QDF_STATUS_E_FAILURE; } @@ -591,7 +612,7 @@ bool mlme_is_connection_fail(struct wlan_objmgr_vdev *vdev) vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return false; } @@ -608,7 +629,7 @@ QDF_STATUS mlme_set_assoc_type(struct wlan_objmgr_vdev *vdev, vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return QDF_STATUS_E_FAILURE; } @@ -626,7 +647,7 @@ enum vdev_assoc_type mlme_get_assoc_type(struct wlan_objmgr_vdev *vdev) vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return false; } @@ -643,7 +664,7 @@ mlme_set_vdev_start_failed(struct wlan_objmgr_vdev *vdev, bool val) vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return QDF_STATUS_E_FAILURE; } @@ -661,7 +682,7 @@ bool mlme_get_vdev_start_failed(struct wlan_objmgr_vdev *vdev) vdev_mlme = wlan_vdev_mlme_get_cmpt_obj(vdev); if (!vdev_mlme) { - mlme_err("vdev component object is NULL"); + mlme_legacy_err("vdev component object is NULL"); return false; } @@ -680,11 +701,12 @@ bool mlme_get_vdev_start_failed(struct wlan_objmgr_vdev *vdev) static QDF_STATUS vdevmgr_mlme_ext_hdl_create(struct vdev_mlme_obj *vdev_mlme) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); vdev_mlme->ext_vdev_ptr = qdf_mem_malloc(sizeof(struct mlme_legacy_priv)); if (!vdev_mlme->ext_vdev_ptr) { - mlme_err("failed to allocate meory for ext_vdev_ptr"); + mlme_legacy_err("failed to allocate meory for ext_vdev_ptr"); return QDF_STATUS_E_NOMEM; } @@ -700,7 +722,8 @@ QDF_STATUS vdevmgr_mlme_ext_hdl_create(struct vdev_mlme_obj *vdev_mlme) static QDF_STATUS vdevmgr_mlme_ext_hdl_destroy(struct vdev_mlme_obj *vdev_mlme) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); qdf_mem_free(vdev_mlme->ext_vdev_ptr); vdev_mlme->ext_vdev_ptr = NULL; @@ -721,7 +744,8 @@ static QDF_STATUS ap_vdev_dfs_cac_timer_stop(struct vdev_mlme_obj *vdev_mlme, uint16_t event_data_len, void *event_data) { - mlme_debug("vdev id = %d ", vdev_mlme->vdev->vdev_objmgr.vdev_id); + mlme_legacy_debug("vdev id = %d ", + vdev_mlme->vdev->vdev_objmgr.vdev_id); return QDF_STATUS_SUCCESS; } diff --git a/components/mlme/dispatcher/src/wlan_mlme_api.c b/components/mlme/dispatcher/src/wlan_mlme_api.c index 43db2d2f60..5620217684 100644 --- a/components/mlme/dispatcher/src/wlan_mlme_api.c +++ b/components/mlme/dispatcher/src/wlan_mlme_api.c @@ -33,7 +33,7 @@ QDF_STATUS wlan_mlme_get_cfg_str(uint8_t *dst, struct mlme_cfg_str *cfg_str, qdf_size_t *len) { if (*len < cfg_str->len) { - mlme_err("Invalid len %zd", *len); + mlme_legacy_err("Invalid len %zd", *len); return QDF_STATUS_E_INVAL; } @@ -47,8 +47,8 @@ QDF_STATUS wlan_mlme_set_cfg_str(uint8_t *src, struct mlme_cfg_str *dst_cfg_str, qdf_size_t len) { if (len > dst_cfg_str->max_len) { - mlme_err("Invalid len %zd (>%zd)", len, - dst_cfg_str->max_len); + mlme_legacy_err("Invalid len %zd (>%zd)", len, + dst_cfg_str->max_len); return QDF_STATUS_E_INVAL; } @@ -143,7 +143,7 @@ QDF_STATUS wlan_mlme_set_max_amsdu_num(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_E_FAILURE; if (!cfg_in_range(CFG_MAX_AMSDU_NUM, value)) { - mlme_err("Error in setting Max AMSDU Num"); + mlme_legacy_err("Error in setting Max AMSDU Num"); return QDF_STATUS_E_INVAL; } @@ -176,7 +176,7 @@ QDF_STATUS wlan_mlme_set_ht_mpdu_density(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_E_FAILURE; if (!cfg_in_range(CFG_MPDU_DENSITY, value)) { - mlme_err("Invalid value %d", value); + mlme_legacy_err("Invalid value %d", value); return QDF_STATUS_E_INVAL; } @@ -465,7 +465,8 @@ QDF_STATUS wlan_mlme_cfg_set_he_ul_mumimo(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_E_FAILURE; if (!cfg_in_range(CFG_HE_UL_MUMIMO, value)) { - mlme_debug("Failed to set CFG_HE_UL_MUMIMO with %d", value); + mlme_legacy_debug("Failed to set CFG_HE_UL_MUMIMO with %d", + value); return QDF_STATUS_E_FAILURE; } @@ -849,15 +850,15 @@ QDF_STATUS wlan_mlme_configure_chain_mask(struct wlan_objmgr_psoc *psoc, if (!mlme_obj) return QDF_STATUS_E_FAILURE; - mlme_debug("txchainmask1x1: %d rxchainmask1x1: %d", - mlme_obj->cfg.chainmask_cfg.txchainmask1x1, - mlme_obj->cfg.chainmask_cfg.rxchainmask1x1); - mlme_debug("tx_chain_mask_2g: %d, rx_chain_mask_2g: %d", - mlme_obj->cfg.chainmask_cfg.tx_chain_mask_2g, - mlme_obj->cfg.chainmask_cfg.rx_chain_mask_2g); - mlme_debug("tx_chain_mask_5g: %d, rx_chain_mask_5g: %d", - mlme_obj->cfg.chainmask_cfg.tx_chain_mask_5g, - mlme_obj->cfg.chainmask_cfg.rx_chain_mask_5g); + mlme_legacy_debug("txchainmask1x1: %d rxchainmask1x1: %d", + mlme_obj->cfg.chainmask_cfg.txchainmask1x1, + mlme_obj->cfg.chainmask_cfg.rxchainmask1x1); + mlme_legacy_debug("tx_chain_mask_2g: %d, rx_chain_mask_2g: %d", + mlme_obj->cfg.chainmask_cfg.tx_chain_mask_2g, + mlme_obj->cfg.chainmask_cfg.rx_chain_mask_2g); + mlme_legacy_debug("tx_chain_mask_5g: %d, rx_chain_mask_5g: %d", + mlme_obj->cfg.chainmask_cfg.tx_chain_mask_5g, + mlme_obj->cfg.chainmask_cfg.rx_chain_mask_5g); if (mlme_obj->cfg.chainmask_cfg.txchainmask1x1) { ch_msk_val = mlme_obj->cfg.chainmask_cfg.txchainmask1x1; @@ -879,7 +880,7 @@ QDF_STATUS wlan_mlme_configure_chain_mask(struct wlan_objmgr_psoc *psoc, if (mlme_obj->cfg.chainmask_cfg.txchainmask1x1 || mlme_obj->cfg.chainmask_cfg.rxchainmask1x1) { - mlme_debug("band agnostic tx/rx chain mask set. skip per band chain mask"); + mlme_legacy_debug("band agnostic tx/rx chain mask set. skip per band chain mask"); return QDF_STATUS_SUCCESS; } @@ -1956,7 +1957,7 @@ static void wlan_mlme_send_oce_flags_fw(struct wlan_objmgr_pdev *pdev, if (wlan_vdev_mlme_get_opmode(vdev) == QDF_STA_MODE) { dynamic_fw_value = mlme_get_dynamic_oce_flags(vdev); if (*updated_fw_value == *dynamic_fw_value) { - mlme_debug("Current FW flags matches with updated value."); + mlme_legacy_debug("Current FW flags matches with updated value."); return; } *dynamic_fw_value = *updated_fw_value; @@ -1964,7 +1965,7 @@ static void wlan_mlme_send_oce_flags_fw(struct wlan_objmgr_pdev *pdev, if (wma_cli_set_command(vdev_id, WMI_VDEV_PARAM_ENABLE_DISABLE_OCE_FEATURES, *updated_fw_value, VDEV_CMD)) - mlme_err("Failed to send OCE update to FW"); + mlme_legacy_err("Failed to send OCE update to FW"); } } @@ -1991,12 +1992,12 @@ void wlan_mlme_update_oce_flags(struct wlan_objmgr_pdev *pdev) ~(WMI_VDEV_OCE_PROBE_REQUEST_RATE_FEATURE_BITMAP); updated_fw_value &= ~(WMI_VDEV_OCE_PROBE_REQUEST_DEFERRAL_FEATURE_BITMAP); - mlme_debug("Disable STA OCE probe req rate and defferal updated_fw_value :%d", - updated_fw_value); + mlme_legacy_debug("Disable STA OCE probe req rate and defferal updated_fw_value :%d", + updated_fw_value); } else { updated_fw_value = mlme_obj->cfg.oce.feature_bitmap; - mlme_debug("Update the STA OCE flags to default INI updated_fw_value :%d", - updated_fw_value); + mlme_legacy_debug("Update the STA OCE flags to default INI updated_fw_value :%d", + updated_fw_value); } wlan_objmgr_pdev_iterate_obj_list(pdev, WLAN_VDEV_OP, @@ -2357,7 +2358,7 @@ QDF_STATUS wlan_mlme_get_edca_params(struct wlan_mlme_edca_params *edca_params, wlan_mlme_get_cfg_str(data, &edca_params->etsi_acvo_b, &len); break; default: - mlme_err("Invalid edca access category"); + mlme_legacy_err("Invalid edca access category"); return QDF_STATUS_E_INVAL; } return QDF_STATUS_SUCCESS; @@ -2372,17 +2373,17 @@ QDF_STATUS mlme_get_wep_key(struct wlan_objmgr_vdev *vdev, struct wlan_crypto_key *crypto_key = NULL; if (wep_keyid >= WLAN_CRYPTO_MAXKEYIDX) { - mlme_err("Incorrect wep key index %d", wep_keyid); + mlme_legacy_err("Incorrect wep key index %d", wep_keyid); return QDF_STATUS_E_INVAL; } crypto_key = wlan_crypto_get_key(vdev, wep_keyid); if (!crypto_key) { - mlme_err("Crypto KEY not present"); + mlme_legacy_err("Crypto KEY not present"); return QDF_STATUS_E_INVAL; } if (crypto_key->keylen > WLAN_CRYPTO_KEY_WEP104_LEN) { - mlme_err("Key too large to hold"); + mlme_legacy_err("Key too large to hold"); return QDF_STATUS_E_INVAL; } *key_len = crypto_key->keylen; @@ -2422,10 +2423,10 @@ QDF_STATUS mlme_get_wep_key(struct wlan_objmgr_vdev *vdev, break; default: - mlme_err("Invalid key id:%d", wep_keyid); + mlme_legacy_err("Invalid key id:%d", wep_keyid); return QDF_STATUS_E_INVAL; } - mlme_debug("key_id:%d key_len:%zd", wep_keyid, *key_len); + mlme_legacy_debug("key_id:%d key_len:%zd", wep_keyid, *key_len); return QDF_STATUS_SUCCESS; } #endif /* CRYPTO_SET_KEY_CONVERGED */ @@ -2437,7 +2438,8 @@ QDF_STATUS mlme_set_wep_key(struct wlan_mlme_wep_cfg *wep_params, if (len == 0) return QDF_STATUS_E_FAILURE; - mlme_debug("WEP set key for key_id:%d key_len:%zd", wep_keyid, len); + mlme_legacy_debug("WEP set key for key_id:%d key_len:%zd", + wep_keyid, len); switch (wep_keyid) { case MLME_WEP_DEFAULT_KEY_1: wlan_mlme_set_cfg_str(key_to_set, @@ -2464,7 +2466,7 @@ QDF_STATUS mlme_set_wep_key(struct wlan_mlme_wep_cfg *wep_params, break; default: - mlme_err("Invalid key id:%d", wep_keyid); + mlme_legacy_err("Invalid key id:%d", wep_keyid); return QDF_STATUS_E_INVAL; } @@ -3300,7 +3302,7 @@ wlan_mlme_get_self_gen_frm_pwr(struct wlan_objmgr_psoc *psoc, mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_SELF_GEN_FRM_PWR); - mlme_err("Failed to get MLME Obj"); + mlme_legacy_err("Failed to get MLME Obj"); return QDF_STATUS_E_FAILURE; } @@ -3326,7 +3328,7 @@ QDF_STATUS wlan_mlme_ibss_power_save_setup(struct wlan_objmgr_psoc *psoc, ibss_cfg->atim_win_size, VDEV_CMD); if (ret) { - mlme_err("atim window set failed: %d", ret); + mlme_legacy_err("atim window set failed: %d", ret); return QDF_STATUS_E_FAILURE; } @@ -3335,7 +3337,7 @@ QDF_STATUS wlan_mlme_ibss_power_save_setup(struct wlan_objmgr_psoc *psoc, ibss_cfg->power_save_allow, VDEV_CMD); if (ret) { - mlme_err("power save allow failed %d", ret); + mlme_legacy_err("power save allow failed %d", ret); return QDF_STATUS_E_FAILURE; } @@ -3344,7 +3346,7 @@ QDF_STATUS wlan_mlme_ibss_power_save_setup(struct wlan_objmgr_psoc *psoc, ibss_cfg->power_collapse_allow, VDEV_CMD); if (ret) { - mlme_err("power collapse allow failed %d", ret); + mlme_legacy_err("power collapse allow failed %d", ret); return QDF_STATUS_E_FAILURE; } @@ -3353,7 +3355,7 @@ QDF_STATUS wlan_mlme_ibss_power_save_setup(struct wlan_objmgr_psoc *psoc, ibss_cfg->awake_on_tx_rx, VDEV_CMD); if (ret) { - mlme_err("set awake on tx/rx failed %d", ret); + mlme_legacy_err("set awake on tx/rx failed %d", ret); return QDF_STATUS_E_FAILURE; } @@ -3362,7 +3364,7 @@ QDF_STATUS wlan_mlme_ibss_power_save_setup(struct wlan_objmgr_psoc *psoc, ibss_cfg->inactivity_bcon_count, VDEV_CMD); if (ret) { - mlme_err("set inactivity time failed %d", ret); + mlme_legacy_err("set inactivity time failed %d", ret); return QDF_STATUS_E_FAILURE; } @@ -3371,7 +3373,7 @@ QDF_STATUS wlan_mlme_ibss_power_save_setup(struct wlan_objmgr_psoc *psoc, ibss_cfg->txsp_end_timeout, VDEV_CMD); if (ret) { - mlme_err("set txsp end failed %d", ret); + mlme_legacy_err("set txsp end failed %d", ret); return QDF_STATUS_E_FAILURE; } @@ -3380,7 +3382,7 @@ QDF_STATUS wlan_mlme_ibss_power_save_setup(struct wlan_objmgr_psoc *psoc, ibss_cfg->ps_warm_up_time, VDEV_CMD); if (ret) { - mlme_err("set ps warmup failed %d", ret); + mlme_legacy_err("set ps warmup failed %d", ret); return QDF_STATUS_E_FAILURE; } @@ -3389,7 +3391,7 @@ QDF_STATUS wlan_mlme_ibss_power_save_setup(struct wlan_objmgr_psoc *psoc, ibss_cfg->ps_1rx_chain_atim_win, VDEV_CMD); if (ret) { - mlme_err("set 1rx chain atim failed %d", ret); + mlme_legacy_err("set 1rx chain atim failed %d", ret); return QDF_STATUS_E_FAILURE; } diff --git a/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c b/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c index aee44af976..f7b7cccef9 100644 --- a/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c +++ b/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c @@ -64,7 +64,7 @@ static QDF_STATUS ucfg_mlme_vdev_init(void) mlme_vdev_object_created_notification, NULL); if (QDF_IS_STATUS_ERROR(status)) { - mlme_err("unable to register vdev create handle"); + mlme_legacy_err("unable to register vdev create handle"); return status; } @@ -73,7 +73,7 @@ static QDF_STATUS ucfg_mlme_vdev_init(void) mlme_vdev_object_destroyed_notification, NULL); if (QDF_IS_STATUS_ERROR(status)) - mlme_err("unable to register vdev create handle"); + mlme_legacy_err("unable to register vdev create handle"); return status; @@ -89,7 +89,7 @@ static QDF_STATUS ucfg_mlme_vdev_deinit(void) NULL); if (QDF_IS_STATUS_ERROR(status)) - mlme_err("unable to unregister vdev destroy handle"); + mlme_legacy_err("unable to unregister vdev destroy handle"); status = wlan_objmgr_unregister_vdev_create_handler( WLAN_UMAC_COMP_MLME, @@ -97,7 +97,7 @@ static QDF_STATUS ucfg_mlme_vdev_deinit(void) NULL); if (QDF_IS_STATUS_ERROR(status)) - mlme_err("unable to unregister vdev create handle"); + mlme_legacy_err("unable to unregister vdev create handle"); return status; } @@ -113,7 +113,7 @@ QDF_STATUS ucfg_mlme_init(void) mlme_psoc_object_created_notification, NULL); if (status != QDF_STATUS_SUCCESS) { - mlme_err("unable to register psoc create handle"); + mlme_legacy_err("unable to register psoc create handle"); return status; } @@ -122,7 +122,7 @@ QDF_STATUS ucfg_mlme_init(void) mlme_psoc_object_destroyed_notification, NULL); if (status != QDF_STATUS_SUCCESS) { - mlme_err("unable to register psoc create handle"); + mlme_legacy_err("unable to register psoc create handle"); return status; } @@ -135,7 +135,7 @@ QDF_STATUS ucfg_mlme_init(void) mlme_peer_object_created_notification, NULL); if (QDF_IS_STATUS_ERROR(status)) { - mlme_err("peer create register notification failed"); + mlme_legacy_err("peer create register notification failed"); return QDF_STATUS_E_FAILURE; } @@ -144,7 +144,7 @@ QDF_STATUS ucfg_mlme_init(void) mlme_peer_object_destroyed_notification, NULL); if (QDF_IS_STATUS_ERROR(status)) { - mlme_err("peer destroy register notification failed"); + mlme_legacy_err("peer destroy register notification failed"); return QDF_STATUS_E_FAILURE; } @@ -160,25 +160,25 @@ QDF_STATUS ucfg_mlme_deinit(void) mlme_peer_object_destroyed_notification, NULL); if (QDF_IS_STATUS_ERROR(status)) - mlme_err("unable to unregister peer destroy handle"); + mlme_legacy_err("unable to unregister peer destroy handle"); status = wlan_objmgr_unregister_peer_create_handler( WLAN_UMAC_COMP_MLME, mlme_peer_object_created_notification, NULL); if (QDF_IS_STATUS_ERROR(status)) - mlme_err("unable to unregister peer create handle"); + mlme_legacy_err("unable to unregister peer create handle"); status = ucfg_mlme_vdev_deinit(); if (QDF_IS_STATUS_ERROR(status)) - mlme_err("unable to unregister vdev destroy handle"); + mlme_legacy_err("unable to unregister vdev destroy handle"); status = wlan_objmgr_unregister_psoc_destroy_handler( WLAN_UMAC_COMP_MLME, mlme_psoc_object_destroyed_notification, NULL); if (QDF_IS_STATUS_ERROR(status)) - mlme_err("unable to unregister psoc destroy handle"); + mlme_legacy_err("unable to unregister psoc destroy handle"); status = wlan_objmgr_unregister_psoc_create_handler( WLAN_UMAC_COMP_MLME, @@ -186,7 +186,7 @@ QDF_STATUS ucfg_mlme_deinit(void) NULL); if (status != QDF_STATUS_SUCCESS) - mlme_err("unable to unregister psoc create handle"); + mlme_legacy_err("unable to unregister psoc create handle"); return status; } @@ -197,7 +197,7 @@ QDF_STATUS ucfg_mlme_psoc_open(struct wlan_objmgr_psoc *psoc) status = mlme_cfg_on_psoc_enable(psoc); if (!QDF_IS_STATUS_SUCCESS(status)) - mlme_err("Failed to initialize MLME CFG"); + mlme_legacy_err("Failed to initialize MLME CFG"); return status; } @@ -214,7 +214,7 @@ QDF_STATUS ucfg_mlme_pdev_open(struct wlan_objmgr_pdev *pdev) pdev_mlme = wlan_pdev_mlme_get_cmpt_obj(pdev); if (!pdev_mlme) { - mlme_err(" PDEV MLME is NULL"); + mlme_legacy_err(" PDEV MLME is NULL"); return QDF_STATUS_E_FAILURE; } pdev_mlme->mlme_register_ops = mlme_register_vdev_mgr_ops; @@ -1194,8 +1194,8 @@ ucfg_mlme_set_wmi_wq_watchdog_timeout(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_E_INVAL; if (!cfg_in_range(CFG_WMI_WQ_WATCHDOG, wmi_wq_watchdog_timeout)) { - mlme_err("wmi watchdog bite timeout is invalid %d", - wmi_wq_watchdog_timeout); + mlme_legacy_err("wmi watchdog bite timeout is invalid %d", + wmi_wq_watchdog_timeout); return QDF_STATUS_E_INVAL; } @@ -1332,8 +1332,8 @@ ucfg_mlme_set_ps_data_inactivity_timeout(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_E_INVAL; if (!cfg_in_range(CFG_PS_DATA_INACTIVITY_TIMEOUT, inactivity_timeout)) { - mlme_err("inactivity timeout set value is invalid %d", - inactivity_timeout); + mlme_legacy_err("inactivity timeout set value is invalid %d", + inactivity_timeout); return QDF_STATUS_E_INVAL; } mlme_obj->cfg.timeouts.ps_data_inactivity_timeout = inactivity_timeout; @@ -1391,7 +1391,7 @@ ucfg_mlme_get_latency_enable(struct wlan_objmgr_psoc *psoc, bool *value) mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { - mlme_err("mlme obj null"); + mlme_legacy_err("mlme obj null"); return QDF_STATUS_E_INVAL; } @@ -1409,7 +1409,7 @@ QDF_STATUS ucfg_mlme_get_ibss_cfg(struct wlan_objmgr_psoc *psoc, mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { - mlme_err("MLME Obj null on get IBSS config"); + mlme_legacy_err("MLME Obj null on get IBSS config"); mlme_init_ibss_cfg(psoc, ibss_cfg); return QDF_STATUS_E_INVAL; } @@ -1424,7 +1424,7 @@ QDF_STATUS ucfg_mlme_set_ibss_auto_bssid(struct wlan_objmgr_psoc *psoc, mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { - mlme_err("MLME Obj null on get IBSS config"); + mlme_legacy_err("MLME Obj null on get IBSS config"); return QDF_STATUS_E_INVAL; } mlme_obj->cfg.ibss.auto_bssid = auto_bssid; @@ -1441,7 +1441,7 @@ ucfg_mlme_get_mws_coex_4g_quick_tdm(struct wlan_objmgr_psoc *psoc, mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_MWS_COEX_4G_QUICK_FTDM); - mlme_err("mlme obj null"); + mlme_legacy_err("mlme obj null"); return QDF_STATUS_E_INVAL; } @@ -1459,7 +1459,7 @@ ucfg_mlme_get_mws_coex_5g_nr_pwr_limit(struct wlan_objmgr_psoc *psoc, mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { *val = cfg_default(CFG_MWS_COEX_5G_NR_PWR_LIMIT); - mlme_err("mlme obj null"); + mlme_legacy_err("mlme obj null"); return QDF_STATUS_E_INVAL; } @@ -1478,7 +1478,7 @@ ucfg_mlme_get_etsi13_srd_chan_in_master_mode(struct wlan_objmgr_psoc *psoc, mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_ETSI13_SRD_CHAN_IN_MASTER_MODE); - mlme_err("Failed to get MLME Obj"); + mlme_legacy_err("Failed to get MLME Obj"); return QDF_STATUS_E_INVAL; } @@ -1496,7 +1496,7 @@ ucfg_mlme_get_11d_in_world_mode(struct wlan_objmgr_psoc *psoc, mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_ENABLE_11D_IN_WORLD_MODE); - mlme_err("Failed to get MLME Obj"); + mlme_legacy_err("Failed to get MLME Obj"); return QDF_STATUS_E_INVAL; } @@ -1514,7 +1514,7 @@ ucfg_mlme_get_restart_beaconing_on_ch_avoid(struct wlan_objmgr_psoc *psoc, mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_RESTART_BEACONING_ON_CH_AVOID); - mlme_err("Failed to get MLME Obj"); + mlme_legacy_err("Failed to get MLME Obj"); return QDF_STATUS_E_INVAL; } @@ -1532,7 +1532,7 @@ ucfg_mlme_get_indoor_channel_support(struct wlan_objmgr_psoc *psoc, mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_INDOOR_CHANNEL_SUPPORT); - mlme_err("Failed to get MLME Obj"); + mlme_legacy_err("Failed to get MLME Obj"); return QDF_STATUS_E_INVAL; } @@ -1550,7 +1550,7 @@ ucfg_mlme_get_scan_11d_interval(struct wlan_objmgr_psoc *psoc, mlme_obj = mlme_get_psoc_obj(psoc); if (!mlme_obj) { *value = cfg_default(CFG_SCAN_11D_INTERVAL); - mlme_err("Failed to get MLME Obj"); + mlme_legacy_err("Failed to get MLME Obj"); return QDF_STATUS_E_INVAL; } @@ -1573,7 +1573,7 @@ ucfg_mlme_get_valid_channel_list(struct wlan_objmgr_psoc *psoc, CFG_VALID_CHANNEL_LIST_LEN, &valid_channel_list_num); *channel_list_num = (uint8_t)valid_channel_list_num; - mlme_err("Failed to get MLME Obj"); + mlme_legacy_err("Failed to get MLME Obj"); return QDF_STATUS_E_INVAL; }