diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index fd810be7fa97..bbd2276e0ba1 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1380,8 +1380,8 @@ static void hdd_send_association_event(struct net_device *dev, ucfg_p2p_status_connect(adapter->vdev); - hdd_info("wlan: " QDF_MAC_ADDR_STR " connected to " - QDF_MAC_ADDR_STR "\n", + hdd_info("%s(vdevid-%d): " QDF_MAC_ADDR_STR " connected to " + QDF_MAC_ADDR_STR, dev->name, adapter->vdev_id, QDF_MAC_ADDR_ARRAY(adapter->mac_addr.bytes), QDF_MAC_ADDR_ARRAY(wrqu.ap_addr.sa_data)); hdd_send_update_beacon_ies_event(adapter, roam_info); @@ -1451,10 +1451,12 @@ static void hdd_send_association_event(struct net_device *dev, adapter->vdev_id); memcpy(wrqu.ap_addr.sa_data, sta_ctx->conn_info.bssid.bytes, ETH_ALEN); - hdd_debug("wlan: new IBSS peer connection to BSSID " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes)); + hdd_debug("%s(vdevid-%d): new IBSS peer connection to BSSID " QDF_MAC_ADDR_STR, + dev->name, adapter->vdev_id, + QDF_MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes)); } else { /* Not Associated */ - hdd_debug("wlan: disconnected"); + hdd_info("%s(vdevid-%d): disconnected", dev->name, + adapter->vdev_id); memset(wrqu.ap_addr.sa_data, '\0', ETH_ALEN); policy_mgr_decr_session_set_pcl(hdd_ctx->psoc, adapter->device_mode, adapter->vdev_id); @@ -3488,13 +3490,15 @@ hdd_association_completion_handler(struct hdd_adapter *adapter, qdf_copy_macaddr(&roam_info->bssid, &sta_ctx->requested_bssid); if (roam_info) - hdd_err("wlan: connection failed with " QDF_MAC_ADDR_STR - " result: %d and Status: %d", + hdd_err("%s(vdevid-%d): connection failed with " QDF_MAC_ADDR_STR + " result: %d and Status: %d", dev->name, + adapter->vdev_id, QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes), roam_result, roam_status); else - hdd_err("wlan: connection failed with " QDF_MAC_ADDR_STR - " result: %d and Status: %d", + hdd_err("%s(vdevid-%d): connection failed with " QDF_MAC_ADDR_STR + " result: %d and Status: %d", dev->name, + adapter->vdev_id, QDF_MAC_ADDR_ARRAY(sta_ctx->requested_bssid.bytes), roam_result, roam_status); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 85638c2655de..13eac7c06f9a 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -17889,10 +17889,11 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *adapter, bssid_hint); } - hdd_debug("Connect to SSID: %.*s operating Channel: %u", - roam_profile->SSIDs.SSIDList->SSID.length, - roam_profile->SSIDs.SSIDList->SSID.ssId, - operatingChannel); + hdd_debug("vdevid %d: Connect to SSID: %.*s operating Channel: %u", + adapter->vdev_id, + roam_profile->SSIDs.SSIDList->SSID.length, + roam_profile->SSIDs.SSIDList->SSID.ssId, + operatingChannel); if (hdd_sta_ctx->wpa_versions) { hdd_set_genie_to_csr(adapter, &rsn_auth_type); @@ -20235,8 +20236,9 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy, TRACE_CODE_HDD_CFG80211_CONNECT, adapter->vdev_id, adapter->device_mode); - hdd_debug("Device_mode %s(%d)", - qdf_opmode_str(adapter->device_mode), adapter->device_mode); + hdd_info("%s(vdevid-%d): Device_mode %s(%d)", + ndev->name, adapter->vdev_id, + qdf_opmode_str(adapter->device_mode), adapter->device_mode); if (adapter->device_mode != QDF_STA_MODE && adapter->device_mode != QDF_P2P_CLIENT_MODE) { @@ -20728,8 +20730,8 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy, false, true, vdev); hdd_objmgr_put_vdev(vdev); - hdd_info("Disconnect from userspace; reason:%d (%s)", - reason, hdd_ieee80211_reason_code_to_str(reason)); + hdd_info("%s(vdevid-%d): Disconnect from userspace; reason:%d (%s)", + dev->name, adapter->vdev_id, reason, hdd_ieee80211_reason_code_to_str(reason)); status = wlan_hdd_disconnect(adapter, reasonCode); if (0 != status) { hdd_err("wlan_hdd_disconnect failed, status: %d", status); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 7b4ab9e0a56a..10b63bdc585c 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -15604,8 +15604,8 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId, qdf_mem_copy(&csr_join_req->self_mac_addr, &pSession->self_mac_addr, sizeof(tSirMacAddr)); - sme_info("Connecting to ssid:%.*s bssid: "QDF_MAC_ADDR_STR" rssi: %d freq: %d country_code: %c%c", - csr_join_req->ssId.length, csr_join_req->ssId.ssId, + sme_info("vdevid-%d: Connecting to ssid:%.*s bssid: "QDF_MAC_ADDR_STR" rssi: %d freq: %d country_code: %c%c", + sessionId, csr_join_req->ssId.length, csr_join_req->ssId.ssId, QDF_MAC_ADDR_ARRAY(pBssDescription->bssId), pBssDescription->rssi, pBssDescription->chan_freq, mac->scan.countryCodeCurrent[0],