A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Replace QDF_MAC_ADDR_STR/ARRAY with QDF_FULL_MAC_FMT/REF

Browse source 
Replace QDF_MAC_ADDR_STR/ARRAY with QDF_FULL_MAC_FMT/REF.
Only in kernel and driver logs, use QDF_MAC_ADDR_FMT
for all debugfs, sysfs, ioctl, unit test code use QDF_FULL_MAC_FMT

Change-Id: I8cd0c065dad94e4700a009b951b10ee699568813
CRs-Fixed: 2763159
This commit is contained in:
Srinivas Girigowda 2020-08-25 23:13:38 -07:00 • committed by snandini
commit 0a3c47ece6
11 changed files with 40 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/hdd/src/wlan_hdd_cfg80211.c
View file

@ -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);

8
core/hdd/src/wlan_hdd_cfr.c
View file

@ -98,8 +98,8 @@ wlan_cfg80211_cfr_set_group_config(struct wlan_objmgr_vdev *vdev,
nla_memcpy(&params.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(&params.ta_mask[0]));
hdd_debug("ta_mask " QDF_FULL_MAC_FMT,
QDF_FULL_MAC_REF(&params.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(&params.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(&params.ra_mask[0]));
hdd_debug("ra_mask " QDF_FULL_MAC_FMT,
QDF_FULL_MAC_REF(&params.ra_mask[0]));
}
if (!qdf_is_macaddr_zero((struct qdf_mac_addr *)&params.ta) ||

4
core/hdd/src/wlan_hdd_debugfs_offload.c
View file

@ -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;

18
core/hdd/src/wlan_hdd_debugfs_roam.c
View file

@ -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);

8
core/hdd/src/wlan_hdd_hostapd.c
View file

@ -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);

8
core/hdd/src/wlan_hdd_hostapd_wext.c
View file

@ -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++;

2
core/hdd/src/wlan_hdd_station_info.c
View file

@ -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:

4
core/hdd/src/wlan_hdd_sysfs_connect_info.c
View file

@ -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,

4
core/hdd/src/wlan_hdd_sysfs_modify_acl.c
View file

@ -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),

9
core/hdd/src/wlan_hdd_sysfs_sta_info.c
View file

@ -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,

4
core/hdd/src/wlan_hdd_twt.c
View file

@ -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();
}