diff --git a/os_if/linux/mlme/src/osif_cm_connect_rsp.c b/os_if/linux/mlme/src/osif_cm_connect_rsp.c index d19ddbd1a5..e2798347e5 100644 --- a/os_if/linux/mlme/src/osif_cm_connect_rsp.c +++ b/os_if/linux/mlme/src/osif_cm_connect_rsp.c @@ -1074,21 +1074,40 @@ static inline void osif_check_and_unlink_bss(struct wlan_objmgr_vdev *vdev, {} #endif +#define OSIF_CM_FAIL_INFO_STRING_SIZE 50 + +static inline void +osif_dump_connect_rsp(struct wlan_objmgr_vdev *vdev, + struct vdev_osif_priv *osif_priv, + struct wlan_cm_connect_resp *rsp) +{ + char fail_info[OSIF_CM_FAIL_INFO_STRING_SIZE] = {0}; + + /* Fill status code and reason only on failure */ + if (QDF_IS_STATUS_ERROR(rsp->connect_status)) + qdf_scnprintf(fail_info, sizeof(fail_info), + "reason %d status %d %s", + rsp->reason, rsp->status_code, + rsp->send_disconnect ? + ", Send disconnect" : ""); + + osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " %s with " QDF_MAC_ADDR_FMT " \"" QDF_SSID_FMT "\" is %s, cmid 0x%x %s", + osif_priv->wdev->netdev->name, rsp->vdev_id, + QDF_MAC_ADDR_REF(wlan_vdev_mlme_get_macaddr(vdev)), + rsp->is_reassoc ? "Roam" : "Connect", + QDF_MAC_ADDR_REF(rsp->bssid.bytes), + QDF_SSID_REF(rsp->ssid.length, rsp->ssid.ssid), + rsp->connect_status ? "FAILURE" : "SUCCESS", rsp->cm_id, + fail_info); +} + QDF_STATUS osif_connect_handler(struct wlan_objmgr_vdev *vdev, struct wlan_cm_connect_resp *rsp) { struct vdev_osif_priv *osif_priv = wlan_vdev_get_ospriv(vdev); QDF_STATUS status; - osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " Connect with " QDF_MAC_ADDR_FMT " SSID \"" QDF_SSID_FMT "\" is %s cm_id 0x%x cm_reason %d status_code %d is_reassoc %d send discon %d", - osif_priv->wdev->netdev->name, rsp->vdev_id, - QDF_MAC_ADDR_REF(wlan_vdev_mlme_get_macaddr(vdev)), - QDF_MAC_ADDR_REF(rsp->bssid.bytes), - QDF_SSID_REF(rsp->ssid.length, rsp->ssid.ssid), - rsp->connect_status ? "FAILURE" : "SUCCESS", rsp->cm_id, - rsp->reason, rsp->status_code, rsp->is_reassoc, - rsp->send_disconnect); - + osif_dump_connect_rsp(vdev, osif_priv, rsp); osif_check_and_unlink_bss(vdev, rsp); status = osif_validate_connect_and_reset_src_id(osif_priv, rsp); @@ -1138,12 +1157,7 @@ QDF_STATUS osif_failed_candidate_handler(struct wlan_objmgr_vdev *vdev, { struct vdev_osif_priv *osif_priv = wlan_vdev_get_ospriv(vdev); - osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " Connect with " QDF_MAC_ADDR_FMT " SSID \"" QDF_SSID_FMT "\" FAILED cm_id 0x%x cm_reason %d reason_code %d", - osif_priv->wdev->netdev->name, rsp->vdev_id, - QDF_MAC_ADDR_REF(wlan_vdev_mlme_get_macaddr(vdev)), - QDF_MAC_ADDR_REF(rsp->bssid.bytes), - QDF_SSID_REF(rsp->ssid.length, rsp->ssid.ssid), - rsp->cm_id, rsp->reason, rsp->status_code); + osif_dump_connect_rsp(vdev, osif_priv, rsp); /** * Do not unlink the BSS if it is an ML candidate. In case of ML, diff --git a/os_if/linux/mlme/src/osif_cm_disconnect_rsp.c b/os_if/linux/mlme/src/osif_cm_disconnect_rsp.c index 2d8a23b82d..7f89e9f4f8 100644 --- a/os_if/linux/mlme/src/osif_cm_disconnect_rsp.c +++ b/os_if/linux/mlme/src/osif_cm_disconnect_rsp.c @@ -285,7 +285,7 @@ QDF_STATUS osif_disconnect_handler(struct wlan_objmgr_vdev *vdev, { enum ieee80211_reasoncode ieee80211_reason; struct vdev_osif_priv *osif_priv = wlan_vdev_get_ospriv(vdev); - bool locally_generated = true; + bool locally_generated; QDF_STATUS status = QDF_STATUS_SUCCESS; enum qca_disconnect_reason_codes qca_reason; int link_id = -1; @@ -297,11 +297,11 @@ QDF_STATUS osif_disconnect_handler(struct wlan_objmgr_vdev *vdev, locally_generated = osif_is_disconnect_locally_generated(rsp); - osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " %sdisconnect " QDF_MAC_ADDR_FMT " cm_id 0x%x source %d reason:%u %s vendor:%u %s", + osif_nofl_info("%s(vdevid-%d): " QDF_MAC_ADDR_FMT " %s disconnect " QDF_MAC_ADDR_FMT " cmid 0x%x src %d reason:%u %s vendor:%u %s", osif_priv->wdev->netdev->name, rsp->req.req.vdev_id, QDF_MAC_ADDR_REF(wlan_vdev_mlme_get_macaddr(vdev)), - locally_generated ? "locally-generated " : "", + locally_generated ? "locally-generated" : "", QDF_MAC_ADDR_REF(rsp->req.req.bssid.bytes), rsp->req.cm_id, rsp->req.req.source, ieee80211_reason, ucfg_cm_reason_code_to_str(rsp->req.req.reason_code),