diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index e9fc54649684..78b91ab597b4 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -9530,8 +9530,8 @@ int hdd_twt_get_add_dialog_values(struct nlattr **tb, params->flag_flow_type, params->flag_protection); hdd_debug("twt: peer mac_addr " - QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(params->peer_macaddr)); + QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(params->peer_macaddr)); return 0; } @@ -18128,8 +18128,8 @@ wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter, wrqu.data.pointer = metrics_notification; wrqu.data.length = scnprintf(metrics_notification, sizeof(metrics_notification), - "QCOM: LFR_PREAUTH_INIT " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes)); + "QCOM: LFR_PREAUTH_INIT " QDF_FULL_MAC_FMT, + QDF_FULL_MAC_REF(roam_info->bssid.bytes)); hdd_wext_send_event(adapter->dev, IWEVCUSTOM, &wrqu, metrics_notification); @@ -18169,8 +18169,8 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *adapter, memset(metrics_notification, 0, sizeof(metrics_notification)); scnprintf(metrics_notification, sizeof(metrics_notification), - "QCOM: LFR_PREAUTH_STATUS " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes)); + "QCOM: LFR_PREAUTH_STATUS " QDF_FULL_MAC_FMT, + QDF_FULL_MAC_REF(roam_info->bssid.bytes)); if (1 == preauth_status) strlcat(metrics_notification, " true", @@ -18221,8 +18221,8 @@ wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter, wrqu.data.length = scnprintf(metrics_notification, sizeof(metrics_notification), "QCOM: LFR_PREAUTH_HANDOVER " - QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes)); + QDF_FULL_MAC_FMT, + QDF_FULL_MAC_REF(roam_info->bssid.bytes)); hdd_wext_send_event(adapter->dev, IWEVCUSTOM, &wrqu, metrics_notification); diff --git a/core/hdd/src/wlan_hdd_cfr.c b/core/hdd/src/wlan_hdd_cfr.c index 9071d492bb6a..d7feb5770a23 100644 --- a/core/hdd/src/wlan_hdd_cfr.c +++ b/core/hdd/src/wlan_hdd_cfr.c @@ -98,8 +98,8 @@ wlan_cfg80211_cfr_set_group_config(struct wlan_objmgr_vdev *vdev, nla_memcpy(¶ms.ta_mask[0], tb[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_TA_MASK], QDF_MAC_ADDR_SIZE); - hdd_debug("ta_mask " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(¶ms.ta_mask[0])); + hdd_debug("ta_mask " QDF_FULL_MAC_FMT, + QDF_FULL_MAC_REF(¶ms.ta_mask[0])); } if (tb[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_RA]) { @@ -114,8 +114,8 @@ wlan_cfg80211_cfr_set_group_config(struct wlan_objmgr_vdev *vdev, nla_memcpy(¶ms.ra_mask[0], tb[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_RA_MASK], QDF_MAC_ADDR_SIZE); - hdd_debug("ra_mask " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(¶ms.ra_mask[0])); + hdd_debug("ra_mask " QDF_FULL_MAC_FMT, + QDF_FULL_MAC_REF(¶ms.ra_mask[0])); } if (!qdf_is_macaddr_zero((struct qdf_mac_addr *)¶ms.ta) || diff --git a/core/hdd/src/wlan_hdd_debugfs_offload.c b/core/hdd/src/wlan_hdd_debugfs_offload.c index 22c7d3d1c001..2687efd4e966 100644 --- a/core/hdd/src/wlan_hdd_debugfs_offload.c +++ b/core/hdd/src/wlan_hdd_debugfs_offload.c @@ -99,8 +99,8 @@ wlan_hdd_mc_addr_list_info_debugfs(struct hdd_context *hdd_ctx, } ret = scnprintf(buf + length, buf_avail_len - length, - QDF_MAC_ADDR_STR "\n", - QDF_MAC_ADDR_ARRAY(mc_addr_list.mc_addr[i].bytes)); + QDF_FULL_MAC_FMT "\n", + QDF_FULL_MAC_REF(mc_addr_list.mc_addr[i].bytes)); if (ret <= 0) return length; length += ret; diff --git a/core/hdd/src/wlan_hdd_debugfs_roam.c b/core/hdd/src/wlan_hdd_debugfs_roam.c index 6051f669d932..166a7f9bc8a5 100644 --- a/core/hdd/src/wlan_hdd_debugfs_roam.c +++ b/core/hdd/src/wlan_hdd_debugfs_roam.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -476,16 +476,16 @@ wlan_hdd_update_roam_stats(struct hdd_context *hdd_ctx, ret = scnprintf(buf + length, buf_avail_len - length, "\nSTA roamed from " - QDF_MAC_ADDR_STR " to " - QDF_MAC_ADDR_STR "\n", - QDF_MAC_ADDR_ARRAY(scan->old_bssid), - QDF_MAC_ADDR_ARRAY(scan->new_bssid)); + QDF_FULL_MAC_FMT " to " + QDF_FULL_MAC_FMT "\n", + QDF_FULL_MAC_REF(scan->old_bssid), + QDF_FULL_MAC_REF(scan->new_bssid)); } else { ret = scnprintf(buf + length, buf_avail_len - length, - "\nSTA is connected to " QDF_MAC_ADDR_STR + "\nSTA is connected to " QDF_FULL_MAC_FMT " before and after scan, not roamed\n", - QDF_MAC_ADDR_ARRAY(scan->old_bssid)); + QDF_FULL_MAC_REF(scan->old_bssid)); } if (ret <= 0) goto free_mem; @@ -526,8 +526,8 @@ wlan_hdd_update_roam_stats(struct hdd_context *hdd_ctx, ret = scnprintf(buf + length, buf_avail_len - length, - QDF_MAC_ADDR_STR " %4u %3u %3u\n", - QDF_MAC_ADDR_ARRAY(bssid), + QDF_FULL_MAC_FMT " %4u %3u %3u\n", + QDF_FULL_MAC_REF(bssid), scan->cand[rci].freq, scan->cand[rci].score, scan->cand[rci].rssi); diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 6cf06b286ff6..ff7660253fab 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2541,8 +2541,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, return QDF_STATUS_E_NOMEM; snprintf(unknownSTAEvent, IW_CUSTOM_MAX, - "JOIN_UNKNOWN_STA-"QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(sap_event->sapevt.sapUnknownSTAJoin.macaddr.bytes)); + "JOIN_UNKNOWN_STA-"QDF_FULL_MAC_FMT, + QDF_FULL_MAC_REF(sap_event->sapevt.sapUnknownSTAJoin.macaddr.bytes)); we_event = IWEVCUSTOM; /* Discovered a new node (AP mode). */ wrqu.data.pointer = unknownSTAEvent; wrqu.data.length = strlen(unknownSTAEvent); @@ -2556,10 +2556,10 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, return QDF_STATUS_E_NOMEM; snprintf(maxAssocExceededEvent, IW_CUSTOM_MAX, - "Peer "QDF_MAC_ADDR_STR" denied" + "Peer "QDF_FULL_MAC_FMT" denied" " assoc due to Maximum Mobile Hotspot connections reached. Please disconnect" " one or more devices to enable the new device connection", - QDF_MAC_ADDR_ARRAY(sap_event->sapevt.sapMaxAssocExceeded.macaddr.bytes)); + QDF_FULL_MAC_REF(sap_event->sapevt.sapMaxAssocExceeded.macaddr.bytes)); we_event = IWEVCUSTOM; /* Discovered a new node (AP mode). */ wrqu.data.pointer = maxAssocExceededEvent; wrqu.data.length = strlen(maxAssocExceededEvent); diff --git a/core/hdd/src/wlan_hdd_hostapd_wext.c b/core/hdd/src/wlan_hdd_hostapd_wext.c index 5c23b961ebb3..2b04ae8fdf1d 100644 --- a/core/hdd/src/wlan_hdd_hostapd_wext.c +++ b/core/hdd/src/wlan_hdd_hostapd_wext.c @@ -2255,9 +2255,9 @@ static int hdd_softap_get_sta_info(struct hdd_adapter *adapter, } written += scnprintf(buf + written, size - written, - QDF_MAC_ADDR_STR + QDF_FULL_MAC_FMT " ecsa=%d\n", - QDF_MAC_ADDR_ARRAY(sta->sta_mac.bytes), + QDF_FULL_MAC_REF(sta->sta_mac.bytes), sta->ecsa_capable); hdd_put_sta_info_ref(&adapter->sta_info_list, &sta, true, STA_INFO_SOFTAP_GET_STA_INFO); @@ -2635,8 +2635,8 @@ __iw_get_peer_rssi(struct net_device *dev, struct iw_request_info *info, wrqu->data.length += scnprintf(extra + wrqu->data.length, IW_PRIV_SIZE_MASK - wrqu->data.length, - "["QDF_MAC_ADDR_STR"] [%d]\n", - QDF_MAC_ADDR_ARRAY(rssi_info->peer_stats[i].peer_macaddr), + "["QDF_FULL_MAC_FMT"] [%d]\n", + QDF_FULL_MAC_REF(rssi_info->peer_stats[i].peer_macaddr), rssi_info->peer_stats[i].peer_rssi); wrqu->data.length++; diff --git a/core/hdd/src/wlan_hdd_station_info.c b/core/hdd/src/wlan_hdd_station_info.c index 3bf7baa8b7e5..7cfc65848c7c 100644 --- a/core/hdd/src/wlan_hdd_station_info.c +++ b/core/hdd/src/wlan_hdd_station_info.c @@ -1891,7 +1891,7 @@ __hdd_cfg80211_get_sta_info_cmd(struct wiphy *wiphy, nla_memcpy(mac_addr.bytes, tb[QCA_WLAN_VENDOR_ATTR_GET_STA_INFO_MAC], QDF_MAC_ADDR_SIZE); - hdd_debug("STA " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_addr.bytes)); + hdd_debug("STA " QDF_MAC_ADDR_FMT, QDF_MAC_ADDR_REF(mac_addr.bytes)); switch (adapter->device_mode) { case QDF_STA_MODE: diff --git a/core/hdd/src/wlan_hdd_sysfs_connect_info.c b/core/hdd/src/wlan_hdd_sysfs_connect_info.c index e9544e840874..23f6358f86f4 100644 --- a/core/hdd/src/wlan_hdd_sysfs_connect_info.c +++ b/core/hdd/src/wlan_hdd_sysfs_connect_info.c @@ -355,7 +355,7 @@ static ssize_t wlan_hdd_connect_info(struct hdd_adapter *adapter, uint8_t *buf, } ret_val = scnprintf(buf + length, buf_avail_len - length, "ssid = %s\n" - "bssid = " QDF_MAC_ADDR_STR "\n" + "bssid = " QDF_FULL_MAC_FMT "\n" "connect_time = %s\n" "auth_time = %s\n" "freq = %u\n" @@ -366,7 +366,7 @@ static ssize_t wlan_hdd_connect_info(struct hdd_adapter *adapter, uint8_t *buf, "last_auth_type = %s\n" "dot11mode = %s\n", conn_info->last_ssid.SSID.ssId, - QDF_MAC_ADDR_ARRAY(conn_info->bssid.bytes), + QDF_FULL_MAC_REF(conn_info->bssid.bytes), conn_info->connect_time, conn_info->auth_time, conn_info->chan_freq, diff --git a/core/hdd/src/wlan_hdd_sysfs_modify_acl.c b/core/hdd/src/wlan_hdd_sysfs_modify_acl.c index 4fac3130a173..87af294d9ed7 100644 --- a/core/hdd/src/wlan_hdd_sysfs_modify_acl.c +++ b/core/hdd/src/wlan_hdd_sysfs_modify_acl.c @@ -92,8 +92,8 @@ static ssize_t __hdd_sysfs_modify_acl_store( if (kstrtou32(token, 0, &cmd_type)) return -EINVAL; - hdd_debug("Modify ACL mac:" QDF_MAC_ADDR_STR " type: %d cmd: %d", - QDF_MAC_ADDR_ARRAY(peer_mac), list_type, cmd_type); + hdd_debug("Modify ACL mac:" QDF_MAC_ADDR_FMT " type: %d cmd: %d", + QDF_MAC_ADDR_REF(peer_mac), list_type, cmd_type); qdf_status = wlansap_modify_acl( WLAN_HDD_GET_SAP_CTX_PTR(adapter), diff --git a/core/hdd/src/wlan_hdd_sysfs_sta_info.c b/core/hdd/src/wlan_hdd_sysfs_sta_info.c index 75529b2fbc3b..e76dc996f211 100644 --- a/core/hdd/src/wlan_hdd_sysfs_sta_info.c +++ b/core/hdd/src/wlan_hdd_sysfs_sta_info.c @@ -56,13 +56,8 @@ static ssize_t __show_sta_info(struct net_device *net_dev, char *buf) continue; } ret_val += scnprintf(buf + ret_val, PAGE_SIZE - ret_val, - QDF_MAC_ADDR_STR " ecsa=%d\n", - sta->sta_mac.bytes[0], - sta->sta_mac.bytes[1], - sta->sta_mac.bytes[2], - sta->sta_mac.bytes[3], - sta->sta_mac.bytes[4], - sta->sta_mac.bytes[5], + QDF_FULL_MAC_FMT " ecsa=%d\n", + QDF_FULL_MAC_REF(sta->sta_mac.bytes), sta->ecsa_capable); hdd_put_sta_info_ref(&adapter->sta_info_list, &sta, true, diff --git a/core/hdd/src/wlan_hdd_twt.c b/core/hdd/src/wlan_hdd_twt.c index 9b39cb4b51bd..bee907204933 100644 --- a/core/hdd/src/wlan_hdd_twt.c +++ b/core/hdd/src/wlan_hdd_twt.c @@ -745,9 +745,9 @@ hdd_twt_add_dialog_comp_cb(void *context, osif_request_put(request); hdd_debug("TWT: add dialog_id:%d, status:%d vdev_id %d peer mac_addr" - QDF_MAC_ADDR_STR, params->dialog_id, + QDF_MAC_ADDR_FMT, params->dialog_id, params->status, params->vdev_id, - QDF_MAC_ADDR_ARRAY(params->peer_macaddr)); + QDF_MAC_ADDR_REF(params->peer_macaddr)); hdd_exit(); }