qcacld-3.0: Replace MAC_ADDR_ARRAY with QDF_MAC_ADDR_ARRAY

Replace MAC_ADDR_ARRAY with converged macro QDF_MAC_ADDR_ARRAY.

Change-Id: I8b2779272c32825976a0040e84432a493f83845c
CRs-Fixed: 2431569
This commit is contained in:
Srinivas Girigowda
2019-04-08 12:07:44 -07:00
committed by nshrivas
parent 134f78e5a6
commit 34fbba008b
63 changed files with 439 additions and 433 deletions

View File

@@ -246,7 +246,6 @@ enum hdd_driver_flags {
/* Maximum time(ms) to wait for external acs response */ /* Maximum time(ms) to wait for external acs response */
#define WLAN_VENDOR_ACS_WAIT_TIME 1000 #define WLAN_VENDOR_ACS_WAIT_TIME 1000
#define MAC_ADDR_ARRAY(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
/** Mac Address string **/ /** Mac Address string **/
#define MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x" #define MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x"
#define MAC_ADDRESS_STR_LEN 18 /* Including null terminator */ #define MAC_ADDRESS_STR_LEN 18 /* Including null terminator */

View File

@@ -1374,8 +1374,8 @@ static void hdd_send_association_event(struct net_device *dev,
hdd_info("wlan: " MAC_ADDRESS_STR " connected to " hdd_info("wlan: " MAC_ADDRESS_STR " connected to "
MAC_ADDRESS_STR "\n", MAC_ADDRESS_STR "\n",
MAC_ADDR_ARRAY(adapter->mac_addr.bytes), QDF_MAC_ADDR_ARRAY(adapter->mac_addr.bytes),
MAC_ADDR_ARRAY(wrqu.ap_addr.sa_data)); QDF_MAC_ADDR_ARRAY(wrqu.ap_addr.sa_data));
hdd_send_update_beacon_ies_event(adapter, roam_info); hdd_send_update_beacon_ies_event(adapter, roam_info);
/* /*
@@ -1455,7 +1455,7 @@ static void hdd_send_association_event(struct net_device *dev,
memcpy(wrqu.ap_addr.sa_data, sta_ctx->conn_info.bssid.bytes, memcpy(wrqu.ap_addr.sa_data, sta_ctx->conn_info.bssid.bytes,
ETH_ALEN); ETH_ALEN);
hdd_debug("wlan: new IBSS peer connection to BSSID " MAC_ADDRESS_STR, hdd_debug("wlan: new IBSS peer connection to BSSID " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes)); QDF_MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes));
} else { /* Not Associated */ } else { /* Not Associated */
hdd_debug("wlan: disconnected"); hdd_debug("wlan: disconnected");
memset(wrqu.ap_addr.sa_data, '\0', ETH_ALEN); memset(wrqu.ap_addr.sa_data, '\0', ETH_ALEN);
@@ -2467,7 +2467,7 @@ static uint8_t hdd_get_ibss_peer_sta_id(struct hdd_station_ctx *hddstactx,
if (status != QDF_STATUS_SUCCESS) { if (status != QDF_STATUS_SUCCESS) {
hdd_err("Unable to find station ID for " hdd_err("Unable to find station ID for "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(roaminfo->peerMac.bytes)); QDF_MAC_ADDR_ARRAY(roaminfo->peerMac.bytes));
} }
} }
@@ -2657,7 +2657,7 @@ hdd_roam_set_key_complete_handler(struct hdd_adapter *adapter,
*/ */
hdd_debug("Set Key completion roam_status =%d roam_result=%d " hdd_debug("Set Key completion roam_status =%d roam_result=%d "
MAC_ADDRESS_STR, roam_status, roam_result, MAC_ADDRESS_STR, roam_status, roam_result,
MAC_ADDR_ARRAY(roam_info->peerMac.bytes)); QDF_MAC_ADDR_ARRAY(roam_info->peerMac.bytes));
connected = hdd_conn_get_connected_cipher_algo(sta_ctx, connected = hdd_conn_get_connected_cipher_algo(sta_ctx,
&algorithm); &algorithm);
@@ -3200,7 +3200,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
hdd_debug("sending connect indication to nl80211:for bssid " hdd_debug("sending connect indication to nl80211:for bssid "
MAC_ADDRESS_STR MAC_ADDRESS_STR
" result:%d and Status:%d", " result:%d and Status:%d",
MAC_ADDR_ARRAY QDF_MAC_ADDR_ARRAY
(roam_info->bssid.bytes), (roam_info->bssid.bytes),
roam_result, roam_status); roam_result, roam_status);
@@ -3338,12 +3338,12 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
if (roam_info) if (roam_info)
hdd_err("wlan: connection failed with " MAC_ADDRESS_STR hdd_err("wlan: connection failed with " MAC_ADDRESS_STR
" result: %d and Status: %d", " result: %d and Status: %d",
MAC_ADDR_ARRAY(roam_info->bssid.bytes), QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes),
roam_result, roam_status); roam_result, roam_status);
else else
hdd_err("wlan: connection failed with " MAC_ADDRESS_STR hdd_err("wlan: connection failed with " MAC_ADDRESS_STR
" result: %d and Status: %d", " result: %d and Status: %d",
MAC_ADDR_ARRAY(sta_ctx->requested_bssid.bytes), QDF_MAC_ADDR_ARRAY(sta_ctx->requested_bssid.bytes),
roam_result, roam_status); roam_result, roam_status);
if ((eCSR_ROAM_RESULT_SCAN_FOR_SSID_FAILURE == roam_result) || if ((eCSR_ROAM_RESULT_SCAN_FOR_SSID_FAILURE == roam_result) ||
@@ -3377,7 +3377,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
hdd_err("send connect failure to nl80211: for bssid " hdd_err("send connect failure to nl80211: for bssid "
MAC_ADDRESS_STR MAC_ADDRESS_STR
" result: %d and Status: %d reasoncode: %d", " result: %d and Status: %d reasoncode: %d",
MAC_ADDR_ARRAY(roam_info->bssid.bytes), QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes),
roam_result, roam_status, roam_result, roam_status,
roam_info->reasonCode); roam_info->reasonCode);
sta_ctx->conn_info.assoc_status_code = sta_ctx->conn_info.assoc_status_code =
@@ -3386,7 +3386,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
hdd_err("connect failed: for bssid " hdd_err("connect failed: for bssid "
MAC_ADDRESS_STR MAC_ADDRESS_STR
" result: %d and status: %d ", " result: %d and status: %d ",
MAC_ADDR_ARRAY(sta_ctx->requested_bssid.bytes), QDF_MAC_ADDR_ARRAY(sta_ctx->requested_bssid.bytes),
roam_result, roam_status); roam_result, roam_status);
} }
hdd_debug("Invoking packetdump deregistration API"); hdd_debug("Invoking packetdump deregistration API");
@@ -3547,7 +3547,7 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
/* we created the IBSS, notify supplicant */ /* we created the IBSS, notify supplicant */
hdd_debug("%s: created ibss " MAC_ADDRESS_STR, hdd_debug("%s: created ibss " MAC_ADDRESS_STR,
adapter->dev->name, adapter->dev->name,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
roam_info->pBssDesc->bssId)); roam_info->pBssDesc->bssId));
/* we must first give cfg80211 the BSS information */ /* we must first give cfg80211 the BSS information */
@@ -3881,8 +3881,8 @@ roam_roam_connect_status_update_handler(struct hdd_adapter *adapter,
hdd_debug("IBSS New Peer indication from SME " hdd_debug("IBSS New Peer indication from SME "
"with peerMac " MAC_ADDRESS_STR " BSSID: " "with peerMac " MAC_ADDRESS_STR " BSSID: "
MAC_ADDRESS_STR " and stationID= %d", MAC_ADDRESS_STR " and stationID= %d",
MAC_ADDR_ARRAY(roam_info->peerMac.bytes), QDF_MAC_ADDR_ARRAY(roam_info->peerMac.bytes),
MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes), QDF_MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes),
roam_info->staId); roam_info->staId);
if (!hdd_save_peer if (!hdd_save_peer
@@ -3969,8 +3969,8 @@ roam_roam_connect_status_update_handler(struct hdd_adapter *adapter,
hdd_debug("IBSS Peer Departed from SME " hdd_debug("IBSS Peer Departed from SME "
"with peerMac " MAC_ADDRESS_STR " BSSID: " "with peerMac " MAC_ADDRESS_STR " BSSID: "
MAC_ADDRESS_STR " and stationID= %d", MAC_ADDRESS_STR " and stationID= %d",
MAC_ADDR_ARRAY(roam_info->peerMac.bytes), QDF_MAC_ADDR_ARRAY(roam_info->peerMac.bytes),
MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes), QDF_MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes),
roam_info->staId); roam_info->staId);
hdd_roam_deregister_sta(adapter, roam_info->staId); hdd_roam_deregister_sta(adapter, roam_info->staId);
@@ -4246,7 +4246,7 @@ hdd_indicate_cckm_pre_auth(struct hdd_adapter *adapter,
/* Timestamp0 is lower 32 bits and Timestamp1 is upper 32 bits */ /* Timestamp0 is lower 32 bits and Timestamp1 is upper 32 bits */
hdd_debug("CCXPREAUTHNOTIFY=" MAC_ADDRESS_STR " %d:%d", hdd_debug("CCXPREAUTHNOTIFY=" MAC_ADDRESS_STR " %d:%d",
MAC_ADDR_ARRAY(roam_info->bssid.bytes), QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes),
roam_info->timestamp[0], roam_info->timestamp[1]); roam_info->timestamp[0], roam_info->timestamp[1]);
nBytes = snprintf(pos, freeBytes, "CCXPREAUTHNOTIFY="); nBytes = snprintf(pos, freeBytes, "CCXPREAUTHNOTIFY=");

View File

@@ -3804,7 +3804,7 @@ static int hdd_set_bssid_prefs(struct hdd_context *hdd_ctx,
tb2[PARAM_ROAM_BSSID], tb2[PARAM_ROAM_BSSID],
QDF_MAC_ADDR_SIZE); QDF_MAC_ADDR_SIZE);
hdd_debug(MAC_ADDRESS_STR, hdd_debug(MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(roam_params->bssid_favored[i].bytes)); QDF_MAC_ADDR_ARRAY(roam_params->bssid_favored[i].bytes));
/* Parse and fetch preference factor*/ /* Parse and fetch preference factor*/
if (!tb2[PARAM_RSSI_MODIFIER]) { if (!tb2[PARAM_RSSI_MODIFIER]) {
hdd_err("BSSID Preference score failed"); hdd_err("BSSID Preference score failed");
@@ -3890,7 +3890,7 @@ static int hdd_set_blacklist_bssid(struct hdd_context *hdd_ctx,
nla_memcpy(roam_params->bssid_avoid_list[i].bytes, nla_memcpy(roam_params->bssid_avoid_list[i].bytes,
tb2[PARAM_SET_BSSID], QDF_MAC_ADDR_SIZE); tb2[PARAM_SET_BSSID], QDF_MAC_ADDR_SIZE);
hdd_debug(MAC_ADDRESS_STR, hdd_debug(MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(roam_params->bssid_avoid_list[i].bytes)); QDF_MAC_ADDR_ARRAY(roam_params->bssid_avoid_list[i].bytes));
i++; i++;
} }
} }
@@ -7817,7 +7817,7 @@ wlan_hdd_add_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx,
nla_memcpy(add_req->mac_address.bytes, tb[PARAM_SRC_MAC_ADDR], nla_memcpy(add_req->mac_address.bytes, tb[PARAM_SRC_MAC_ADDR],
QDF_MAC_ADDR_SIZE); QDF_MAC_ADDR_SIZE);
hdd_debug("input src mac address: "MAC_ADDRESS_STR, hdd_debug("input src mac address: "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(add_req->mac_address.bytes)); QDF_MAC_ADDR_ARRAY(add_req->mac_address.bytes));
if (!qdf_is_macaddr_equal(&add_req->mac_address, if (!qdf_is_macaddr_equal(&add_req->mac_address,
&adapter->mac_addr)) { &adapter->mac_addr)) {
@@ -7831,7 +7831,7 @@ wlan_hdd_add_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx,
} }
nla_memcpy(dst_addr.bytes, tb[PARAM_DST_MAC_ADDR], QDF_MAC_ADDR_SIZE); nla_memcpy(dst_addr.bytes, tb[PARAM_DST_MAC_ADDR], QDF_MAC_ADDR_SIZE);
hdd_debug("input dst mac address: "MAC_ADDRESS_STR, hdd_debug("input dst mac address: "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(dst_addr.bytes)); QDF_MAC_ADDR_ARRAY(dst_addr.bytes));
if (!tb[PARAM_IP_PACKET]) { if (!tb[PARAM_IP_PACKET]) {
hdd_err("attr ip packet failed"); hdd_err("attr ip packet failed");
@@ -7941,7 +7941,8 @@ wlan_hdd_del_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx,
return -ENOMEM; return -ENOMEM;
qdf_copy_macaddr(&del_req->mac_address, &adapter->mac_addr); qdf_copy_macaddr(&del_req->mac_address, &adapter->mac_addr);
hdd_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(del_req->mac_address.bytes)); hdd_debug(MAC_ADDRESS_STR,
QDF_MAC_ADDR_ARRAY(del_req->mac_address.bytes));
del_req->ucPtrnId = pattern_id; del_req->ucPtrnId = pattern_id;
hdd_debug("Request Id: %u Pattern id: %d", hdd_debug("Request Id: %u Pattern id: %d",
request_id, del_req->ucPtrnId); request_id, del_req->ucPtrnId);
@@ -8631,7 +8632,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
qdf_mem_copy(peer_mac, nla_data(tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]), qdf_mem_copy(peer_mac, nla_data(tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]),
QDF_MAC_ADDR_SIZE); QDF_MAC_ADDR_SIZE);
hdd_debug("peerMac="MAC_ADDRESS_STR" for device_mode:%d", hdd_debug("peerMac="MAC_ADDRESS_STR" for device_mode:%d",
MAC_ADDR_ARRAY(peer_mac), adapter->device_mode); QDF_MAC_ADDR_ARRAY(peer_mac), adapter->device_mode);
if (adapter->device_mode == QDF_STA_MODE || if (adapter->device_mode == QDF_STA_MODE ||
adapter->device_mode == QDF_P2P_CLIENT_MODE) { adapter->device_mode == QDF_P2P_CLIENT_MODE) {
@@ -8641,7 +8642,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
qdf_mem_cmp(hdd_sta_ctx->conn_info.bssid.bytes, qdf_mem_cmp(hdd_sta_ctx->conn_info.bssid.bytes,
peer_mac, QDF_MAC_ADDR_SIZE)) { peer_mac, QDF_MAC_ADDR_SIZE)) {
hdd_err("Not Associated to mac "MAC_ADDRESS_STR, hdd_err("Not Associated to mac "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_mac)); QDF_MAC_ADDR_ARRAY(peer_mac));
return -EINVAL; return -EINVAL;
} }
@@ -8664,7 +8665,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
if (WLAN_MAX_STA_COUNT == sta_id) { if (WLAN_MAX_STA_COUNT == sta_id) {
hdd_err("No active peer with mac="MAC_ADDRESS_STR, hdd_err("No active peer with mac="MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_mac)); QDF_MAC_ADDR_ARRAY(peer_mac));
return -EINVAL; return -EINVAL;
} }
@@ -8674,7 +8675,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
rate_flags = adapter->sta_info[sta_id].rate_flags; rate_flags = adapter->sta_info[sta_id].rate_flags;
} else { } else {
hdd_err("Not Associated! with mac "MAC_ADDRESS_STR, hdd_err("Not Associated! with mac "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_mac)); QDF_MAC_ADDR_ARRAY(peer_mac));
return -EINVAL; return -EINVAL;
} }
@@ -14256,7 +14257,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
QDF_MAC_ADDR_SIZE); QDF_MAC_ADDR_SIZE);
pr_info("wlan: Generated HotSpot BSSID " pr_info("wlan: Generated HotSpot BSSID "
MAC_ADDRESS_STR "\n", MAC_ADDRESS_STR "\n",
MAC_ADDR_ARRAY(ndev->dev_addr)); QDF_MAC_ADDR_ARRAY(ndev->dev_addr));
} }
hdd_set_ap_ops(adapter->dev); hdd_set_ap_ops(adapter->dev);
@@ -15052,8 +15053,8 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
params->key, params->key_len); params->key, params->key_len);
hdd_debug("Set key for peerMac "MAC_ADDRESS_STR" direction %d", hdd_debug("Set key for peerMac "MAC_ADDRESS_STR" direction %d",
MAC_ADDR_ARRAY(set_key.peerMac.bytes), QDF_MAC_ADDR_ARRAY(set_key.peerMac.bytes),
set_key.keyDirection); set_key.keyDirection);
/* The supplicant may attempt to set the PTK once /* The supplicant may attempt to set the PTK once
* pre-authentication is done. Save the key in the * pre-authentication is done. Save the key in the
@@ -15106,7 +15107,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
qdf_set_macaddr_broadcast(&set_key.peerMac); qdf_set_macaddr_broadcast(&set_key.peerMac);
hdd_debug("Set key peerMac "MAC_ADDRESS_STR" direction %d", hdd_debug("Set key peerMac "MAC_ADDRESS_STR" direction %d",
MAC_ADDR_ARRAY(set_key.peerMac.bytes), QDF_MAC_ADDR_ARRAY(set_key.peerMac.bytes),
set_key.keyDirection); set_key.keyDirection);
status = sme_roam_set_key(mac_handle, status = sme_roam_set_key(mac_handle,
@@ -15606,7 +15607,7 @@ void wlan_hdd_cfg80211_unlink_bss(struct hdd_adapter *adapter,
hdd_err("BSS not present"); hdd_err("BSS not present");
} else { } else {
hdd_debug("cfg80211_unlink_bss called for BSSID " hdd_debug("cfg80211_unlink_bss called for BSSID "
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(bssid)); MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(bssid));
cfg80211_unlink_bss(wiphy, bss); cfg80211_unlink_bss(wiphy, bss);
/* cfg80211_get_bss get bss with ref count so release it */ /* cfg80211_get_bss get bss with ref count so release it */
cfg80211_put_bss(wiphy, bss); cfg80211_put_bss(wiphy, bss);
@@ -15773,7 +15774,7 @@ wlan_hdd_inform_bss_frame(struct hdd_adapter *adapter,
bss_data.per_chain_rssi[i] = WLAN_INVALID_PER_CHAIN_RSSI; bss_data.per_chain_rssi[i] = WLAN_INVALID_PER_CHAIN_RSSI;
hdd_debug("BSSID: " MAC_ADDRESS_STR " Channel:%d RSSI:%d TSF %u seq %d", hdd_debug("BSSID: " MAC_ADDRESS_STR " Channel:%d RSSI:%d TSF %u seq %d",
MAC_ADDR_ARRAY(bss_data.mgmt->bssid), QDF_MAC_ADDR_ARRAY(bss_data.mgmt->bssid),
bss_data.chan->center_freq, (int)(bss_data.rssi / 100), bss_data.chan->center_freq, (int)(bss_data.rssi / 100),
bss_desc->timeStamp[0], ((bss_desc->seq_ctrl.seqNumHi << bss_desc->timeStamp[0], ((bss_desc->seq_ctrl.seqNumHi <<
HIGH_SEQ_NUM_OFFSET) | bss_desc->seq_ctrl.seqNumLo)); HIGH_SEQ_NUM_OFFSET) | bss_desc->seq_ctrl.seqNumLo));
@@ -15846,7 +15847,7 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(struct hdd_adapter *adapter,
return -EINVAL; return -EINVAL;
} }
hdd_info(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(roam_info->bssid.bytes)); hdd_info(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes));
cfg80211_pmksa_candidate_notify(dev, index, cfg80211_pmksa_candidate_notify(dev, index,
roam_info->bssid.bytes, roam_info->bssid.bytes,
preauth, GFP_KERNEL); preauth, GFP_KERNEL);
@@ -15886,7 +15887,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
wrqu.data.length = scnprintf(metrics_notification, wrqu.data.length = scnprintf(metrics_notification,
sizeof(metrics_notification), sizeof(metrics_notification),
"QCOM: LFR_PREAUTH_INIT " MAC_ADDRESS_STR, "QCOM: LFR_PREAUTH_INIT " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(roam_info->bssid.bytes)); QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes));
wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu, wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu,
metrics_notification); metrics_notification);
@@ -15927,7 +15928,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *adapter,
scnprintf(metrics_notification, sizeof(metrics_notification), scnprintf(metrics_notification, sizeof(metrics_notification),
"QCOM: LFR_PREAUTH_STATUS " MAC_ADDRESS_STR, "QCOM: LFR_PREAUTH_STATUS " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(roam_info->bssid.bytes)); QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes));
if (1 == preauth_status) if (1 == preauth_status)
strlcat(metrics_notification, " true", strlcat(metrics_notification, " true",
@@ -15979,7 +15980,7 @@ wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter,
sizeof(metrics_notification), sizeof(metrics_notification),
"QCOM: LFR_PREAUTH_HANDOVER " "QCOM: LFR_PREAUTH_HANDOVER "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(roam_info->bssid.bytes)); QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes));
wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu, wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu,
metrics_notification); metrics_notification);
@@ -18161,7 +18162,7 @@ static int wlan_hdd_reassoc_bssid_hint(struct hdd_adapter *adapter,
if (bssid && channel && req->prev_bssid) { if (bssid && channel && req->prev_bssid) {
hdd_debug("REASSOC Attempt on channel %d to " MAC_ADDRESS_STR, hdd_debug("REASSOC Attempt on channel %d to " MAC_ADDRESS_STR,
channel, MAC_ADDR_ARRAY(bssid)); channel, QDF_MAC_ADDR_ARRAY(bssid));
/* /*
* Save BSSID in a separate variable as * Save BSSID in a separate variable as
* roam_profile's BSSID is getting zeroed out in the * roam_profile's BSSID is getting zeroed out in the
@@ -18320,7 +18321,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy,
if (bssid && hdd_get_adapter_by_macaddr(hdd_ctx, (uint8_t *)bssid)) { if (bssid && hdd_get_adapter_by_macaddr(hdd_ctx, (uint8_t *)bssid)) {
hdd_err("adapter exist with same mac address " MAC_ADDRESS_STR, hdd_err("adapter exist with same mac address " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(bssid)); QDF_MAC_ADDR_ARRAY(bssid));
return -EINVAL; return -EINVAL;
} }
@@ -19503,7 +19504,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
hdd_debug("Delete STA with MAC::" hdd_debug("Delete STA with MAC::"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac)); QDF_MAC_ADDR_ARRAY(mac));
if (hdd_ctx->dev_dfs_cac_status == if (hdd_ctx->dev_dfs_cac_status ==
DFS_CAC_IN_PROGRESS) DFS_CAC_IN_PROGRESS)
@@ -19535,7 +19536,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
hdd_debug("Skip DEL STA as this is not used::" hdd_debug("Skip DEL STA as this is not used::"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac)); QDF_MAC_ADDR_ARRAY(mac));
return -ENOENT; return -ENOENT;
} }
@@ -19543,14 +19544,14 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
true) { true) {
hdd_debug("Skip DEL STA as deauth is in progress::" hdd_debug("Skip DEL STA as deauth is in progress::"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac)); QDF_MAC_ADDR_ARRAY(mac));
return -ENOENT; return -ENOENT;
} }
adapter->sta_info[sta_id].is_deauth_in_progress = true; adapter->sta_info[sta_id].is_deauth_in_progress = true;
hdd_debug("ucast, Delete STA with MAC:" MAC_ADDRESS_STR, hdd_debug("ucast, Delete STA with MAC:" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac)); QDF_MAC_ADDR_ARRAY(mac));
/* Case: SAP in ACS selected DFS ch and client connected /* Case: SAP in ACS selected DFS ch and client connected
* Now Radar detected. Then if random channel is another * Now Radar detected. Then if random channel is another
@@ -19574,7 +19575,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
false; false;
hdd_debug("STA removal failed for ::" hdd_debug("STA removal failed for ::"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac)); QDF_MAC_ADDR_ARRAY(mac));
return -ENOENT; return -ENOENT;
} }
qdf_status = qdf_wait_for_event_completion( qdf_status = qdf_wait_for_event_completion(
@@ -19723,7 +19724,7 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
set = params->sta_flags_set; set = params->sta_flags_set;
hdd_debug("mask 0x%x set 0x%x " MAC_ADDRESS_STR, mask, set, hdd_debug("mask 0x%x set 0x%x " MAC_ADDRESS_STR, mask, set,
MAC_ADDR_ARRAY(mac)); QDF_MAC_ADDR_ARRAY(mac));
if (mask & BIT(NL80211_STA_FLAG_TDLS_PEER)) { if (mask & BIT(NL80211_STA_FLAG_TDLS_PEER)) {
if (set & BIT(NL80211_STA_FLAG_TDLS_PEER)) { if (set & BIT(NL80211_STA_FLAG_TDLS_PEER)) {
@@ -19905,7 +19906,7 @@ static void hdd_fill_pmksa_info(struct hdd_adapter *adapter,
if (pmksa->bssid) { if (pmksa->bssid) {
hdd_debug("%s PMKSA for " MAC_ADDRESS_STR, hdd_debug("%s PMKSA for " MAC_ADDRESS_STR,
is_delete ? "Delete" : "Set", is_delete ? "Delete" : "Set",
MAC_ADDR_ARRAY(pmksa->bssid)); QDF_MAC_ADDR_ARRAY(pmksa->bssid));
qdf_mem_copy(pmk_cache->BSSID.bytes, qdf_mem_copy(pmk_cache->BSSID.bytes,
pmksa->bssid, QDF_MAC_ADDR_SIZE); pmksa->bssid, QDF_MAC_ADDR_SIZE);
} else { } else {
@@ -19962,7 +19963,7 @@ static void hdd_fill_pmksa_info(struct hdd_adapter *adapter,
mac_handle_t mac_handle; mac_handle_t mac_handle;
hdd_debug("%s PMKSA for " MAC_ADDRESS_STR, is_delete ? "Delete" : "Set", hdd_debug("%s PMKSA for " MAC_ADDRESS_STR, is_delete ? "Delete" : "Set",
MAC_ADDR_ARRAY(pmksa->bssid)); QDF_MAC_ADDR_ARRAY(pmksa->bssid));
qdf_mem_copy(pmk_cache->BSSID.bytes, qdf_mem_copy(pmk_cache->BSSID.bytes,
pmksa->bssid, QDF_MAC_ADDR_SIZE); pmksa->bssid, QDF_MAC_ADDR_SIZE);
@@ -20131,7 +20132,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy,
if (QDF_STATUS_SUCCESS != if (QDF_STATUS_SUCCESS !=
wlan_hdd_del_pmksa_cache(adapter, &pmk_cache)) { wlan_hdd_del_pmksa_cache(adapter, &pmk_cache)) {
hdd_err("Failed to delete PMKSA for " MAC_ADDRESS_STR, hdd_err("Failed to delete PMKSA for " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pmksa->bssid)); QDF_MAC_ADDR_ARRAY(pmksa->bssid));
status = -EINVAL; status = -EINVAL;
} }
@@ -20662,7 +20663,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
for (i = 0; i < params->n_acl_entries; i++) { for (i = 0; i < params->n_acl_entries; i++) {
hdd_debug("** Add ACL MAC entry %i in WhiletList :" hdd_debug("** Add ACL MAC entry %i in WhiletList :"
MAC_ADDRESS_STR, i, MAC_ADDRESS_STR, i,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
params->mac_addrs[i].addr)); params->mac_addrs[i].addr));
qdf_mem_copy(&config->accept_mac[i], qdf_mem_copy(&config->accept_mac[i],
@@ -20674,7 +20675,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
for (i = 0; i < params->n_acl_entries; i++) { for (i = 0; i < params->n_acl_entries; i++) {
hdd_debug("** Add ACL MAC entry %i in BlackList :" hdd_debug("** Add ACL MAC entry %i in BlackList :"
MAC_ADDRESS_STR, i, MAC_ADDRESS_STR, i,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
params->mac_addrs[i].addr)); params->mac_addrs[i].addr));
qdf_mem_copy(&config->deny_mac[i], qdf_mem_copy(&config->deny_mac[i],

View File

@@ -368,7 +368,7 @@ wlan_hdd_connect_info_debugfs(struct hdd_adapter *adapter, uint8_t *buf,
"last_auth_type = %s\n" "last_auth_type = %s\n"
"dot11mode = %s\n", "dot11mode = %s\n",
conn_info->last_ssid.SSID.ssId, conn_info->last_ssid.SSID.ssId,
MAC_ADDR_ARRAY(conn_info->bssid.bytes), QDF_MAC_ADDR_ARRAY(conn_info->bssid.bytes),
conn_info->connect_time, conn_info->connect_time,
conn_info->auth_time, conn_info->auth_time,
conn_info->freq, conn_info->freq,

View File

@@ -99,7 +99,7 @@ wlan_hdd_mc_addr_list_info_debugfs(struct hdd_context *hdd_ctx,
ret = scnprintf(buf + length, buf_avail_len - length, ret = scnprintf(buf + length, buf_avail_len - length,
MAC_ADDRESS_STR "\n", MAC_ADDRESS_STR "\n",
MAC_ADDR_ARRAY(mc_addr_list.mc_addr[i].bytes)); QDF_MAC_ADDR_ARRAY(mc_addr_list.mc_addr[i].bytes));
if (ret <= 0) if (ret <= 0)
return length; return length;
length += ret; length += ret;

View File

@@ -478,14 +478,14 @@ wlan_hdd_update_roam_stats(struct hdd_context *hdd_ctx,
"\nSTA roamed from " "\nSTA roamed from "
MAC_ADDRESS_STR " to " MAC_ADDRESS_STR " to "
MAC_ADDRESS_STR "\n", MAC_ADDRESS_STR "\n",
MAC_ADDR_ARRAY(scan->old_bssid), QDF_MAC_ADDR_ARRAY(scan->old_bssid),
MAC_ADDR_ARRAY(scan->new_bssid)); QDF_MAC_ADDR_ARRAY(scan->new_bssid));
} else { } else {
ret = scnprintf(buf + length, ret = scnprintf(buf + length,
buf_avail_len - length, buf_avail_len - length,
"\nSTA is connected to " MAC_ADDRESS_STR "\nSTA is connected to " MAC_ADDRESS_STR
" before and after scan, not roamed\n", " before and after scan, not roamed\n",
MAC_ADDR_ARRAY(scan->old_bssid)); QDF_MAC_ADDR_ARRAY(scan->old_bssid));
} }
if (ret <= 0) if (ret <= 0)
goto free_mem; goto free_mem;
@@ -527,7 +527,7 @@ wlan_hdd_update_roam_stats(struct hdd_context *hdd_ctx,
ret = scnprintf(buf + length, ret = scnprintf(buf + length,
buf_avail_len - length, buf_avail_len - length,
MAC_ADDRESS_STR " %4u %3u %3u\n", MAC_ADDRESS_STR " %4u %3u %3u\n",
MAC_ADDR_ARRAY(bssid), QDF_MAC_ADDR_ARRAY(bssid),
scan->cand[rci].freq, scan->cand[rci].freq,
scan->cand[rci].score, scan->cand[rci].score,
scan->cand[rci].rssi); scan->cand[rci].rssi);

View File

@@ -433,7 +433,7 @@ wlan_hdd_cfg80211_extscan_cached_results_ind(struct hdd_context *hdd_ctx,
"Ie length %d", "Ie length %d",
ap->ts, ap->ts,
ap->ssid, ap->ssid,
MAC_ADDR_ARRAY(ap->bssid.bytes), QDF_MAC_ADDR_ARRAY(ap->bssid.bytes),
ap->channel, ap->channel,
ap->rssi, ap->rssi,
ap->rtt, ap->rtt,
@@ -595,7 +595,7 @@ wlan_hdd_cfg80211_extscan_hotlist_match_ind(struct hdd_context *hdd_ctx,
i, i,
data->ap[i].ts, data->ap[i].ts,
data->ap[i].ssid, data->ap[i].ssid,
MAC_ADDR_ARRAY(data->ap[i].bssid.bytes), QDF_MAC_ADDR_ARRAY(data->ap[i].bssid.bytes),
data->ap[i].channel, data->ap[i].channel,
data->ap[i].rssi, data->ap[i].rssi,
data->ap[i].rtt, data->ap[i].rtt_sd); data->ap[i].rtt, data->ap[i].rtt_sd);
@@ -721,7 +721,7 @@ wlan_hdd_cfg80211_extscan_signif_wifi_change_results_ind(
"Channel %u " "Channel %u "
"numOfRssi %d", "numOfRssi %d",
i, i,
MAC_ADDR_ARRAY(ap_info->bssid.bytes), QDF_MAC_ADDR_ARRAY(ap_info->bssid.bytes),
ap_info->channel, ap_info->numOfRssi); ap_info->channel, ap_info->numOfRssi);
rssi = &(ap_info)->rssi[0]; rssi = &(ap_info)->rssi[0];
for (j = 0; j < ap_info->numOfRssi; j++) for (j = 0; j < ap_info->numOfRssi; j++)
@@ -864,7 +864,7 @@ wlan_hdd_cfg80211_extscan_full_scan_result_event(struct hdd_context *hdd_ctx,
"IE Length %d", "IE Length %d",
data->ap.ts, data->ap.ts,
data->ap.ssid, data->ap.ssid,
MAC_ADDR_ARRAY(data->ap.bssid.bytes), QDF_MAC_ADDR_ARRAY(data->ap.bssid.bytes),
data->ap.channel, data->ap.channel,
data->ap.rssi, data->ap.rssi,
data->ap.rtt, data->ap.rtt,
@@ -1141,7 +1141,7 @@ wlan_hdd_cfg80211_extscan_epno_match_found(struct hdd_context *hdd_ctx,
"IE Length %d", "IE Length %d",
data->ap[i].ts, data->ap[i].ts,
data->ap[i].ssid, data->ap[i].ssid,
MAC_ADDR_ARRAY(data->ap[i].bssid.bytes), QDF_MAC_ADDR_ARRAY(data->ap[i].bssid.bytes),
data->ap[i].channel, data->ap[i].channel,
data->ap[i].rssi, data->ap[i].rssi,
data->ap[i].rtt, data->ap[i].rtt,
@@ -1247,7 +1247,7 @@ wlan_hdd_cfg80211_passpoint_match_found(void *ctx,
"IE Length %d", "IE Length %d",
data->ap.ts, data->ap.ts,
data->ap.ssid, data->ap.ssid,
MAC_ADDR_ARRAY(data->ap.bssid.bytes), QDF_MAC_ADDR_ARRAY(data->ap.bssid.bytes),
data->ap.channel, data->ap.channel,
data->ap.rssi, data->ap.rssi,
data->ap.rtt, data->ap.rtt,
@@ -1880,7 +1880,8 @@ static int hdd_parse_ap_rssi_threshold(struct nlattr *attr,
return -EINVAL; return -EINVAL;
} }
nla_memcpy(ap->bssid.bytes, tb[id], QDF_MAC_ADDR_SIZE); nla_memcpy(ap->bssid.bytes, tb[id], QDF_MAC_ADDR_SIZE);
hdd_debug("BSSID: " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(ap->bssid.bytes)); hdd_debug("BSSID: " MAC_ADDRESS_STR,
QDF_MAC_ADDR_ARRAY(ap->bssid.bytes));
/* Parse and fetch low RSSI */ /* Parse and fetch low RSSI */
id = QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_RSSI_LOW; id = QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_RSSI_LOW;

View File

@@ -686,7 +686,7 @@ static int __hdd_hostapd_set_mac_address(struct net_device *dev, void *addr)
return 0; return 0;
hdd_err("%s adapter exist with same address " MAC_ADDRESS_STR, hdd_err("%s adapter exist with same address " MAC_ADDRESS_STR,
adapter_temp->dev->name, adapter_temp->dev->name,
MAC_ADDR_ARRAY(mac_addr.bytes)); QDF_MAC_ADDR_ARRAY(mac_addr.bytes));
return -EINVAL; return -EINVAL;
} }
@@ -706,7 +706,7 @@ static int __hdd_hostapd_set_mac_address(struct net_device *dev, void *addr)
} }
hdd_info("Changing MAC to " MAC_ADDRESS_STR " of interface %s ", hdd_info("Changing MAC to " MAC_ADDRESS_STR " of interface %s ",
MAC_ADDR_ARRAY(mac_addr.bytes), QDF_MAC_ADDR_ARRAY(mac_addr.bytes),
dev->name); dev->name);
hdd_update_dynamic_mac(hdd_ctx, &adapter->mac_addr, &mac_addr); hdd_update_dynamic_mac(hdd_ctx, &adapter->mac_addr, &mac_addr);
memcpy(&adapter->mac_addr, psta_mac_addr->sa_data, ETH_ALEN); memcpy(&adapter->mac_addr, psta_mac_addr->sa_data, ETH_ALEN);
@@ -2128,7 +2128,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
&sap_event->sapevt.sapStationMICFailureEvent. &sap_event->sapevt.sapStationMICFailureEvent.
staMac, QDF_MAC_ADDR_SIZE); staMac, QDF_MAC_ADDR_SIZE);
hdd_debug("MIC MAC " MAC_ADDRESS_STR, hdd_debug("MIC MAC " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(msg.src_addr.sa_data)); QDF_MAC_ADDR_ARRAY(msg.src_addr.sa_data));
if (sap_event->sapevt.sapStationMICFailureEvent. if (sap_event->sapevt.sapStationMICFailureEvent.
multicast == true) multicast == true)
msg.flags = IW_MICFAILURE_GROUP; msg.flags = IW_MICFAILURE_GROUP;
@@ -2162,7 +2162,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
event = &sap_event->sapevt.sapStationAssocReassocCompleteEvent; event = &sap_event->sapevt.sapStationAssocReassocCompleteEvent;
if (eSAP_STATUS_FAILURE == event->status) { if (eSAP_STATUS_FAILURE == event->status) {
hdd_info("assoc failure: " MAC_ADDRESS_STR, hdd_info("assoc failure: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wrqu.addr.sa_data)); QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data));
break; break;
} }
@@ -2172,7 +2172,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
memcpy(wrqu.addr.sa_data, memcpy(wrqu.addr.sa_data,
&event->staMac, QDF_MAC_ADDR_SIZE); &event->staMac, QDF_MAC_ADDR_SIZE);
hdd_info("associated " MAC_ADDRESS_STR, hdd_info("associated " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wrqu.addr.sa_data)); QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data));
we_event = IWEVREGISTERED; we_event = IWEVREGISTERED;
if ((eCSR_ENCRYPT_TYPE_NONE == ap_ctx->encryption_type) || if ((eCSR_ENCRYPT_TYPE_NONE == ap_ctx->encryption_type) ||
@@ -2194,8 +2194,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
event->wmmEnabled); event->wmmEnabled);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) if (!QDF_IS_STATUS_SUCCESS(qdf_status))
hdd_err("Failed to register STA %d " hdd_err("Failed to register STA %d "
MAC_ADDRESS_STR "", qdf_status, MAC_ADDRESS_STR "", qdf_status,
MAC_ADDR_ARRAY(wrqu.addr.sa_data)); QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data));
} else { } else {
qdf_status = hdd_softap_register_sta( qdf_status = hdd_softap_register_sta(
adapter, adapter,
@@ -2207,8 +2207,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
event->wmmEnabled); event->wmmEnabled);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) if (!QDF_IS_STATUS_SUCCESS(qdf_status))
hdd_err("Failed to register STA %d " hdd_err("Failed to register STA %d "
MAC_ADDRESS_STR "", qdf_status, MAC_ADDRESS_STR "", qdf_status,
MAC_ADDR_ARRAY(wrqu.addr.sa_data)); QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data));
} }
sta_id = event->staId; sta_id = event->staId;
@@ -2326,7 +2326,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
cache_stainfo->disassoc_ts = qdf_system_ticks(); cache_stainfo->disassoc_ts = qdf_system_ticks();
} }
hdd_info(" disassociated " MAC_ADDRESS_STR, hdd_info(" disassociated " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wrqu.addr.sa_data)); QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data));
qdf_status = qdf_event_set(&hostapd_state->qdf_sta_disassoc_event); qdf_status = qdf_event_set(&hostapd_state->qdf_sta_disassoc_event);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) if (!QDF_IS_STATUS_SUCCESS(qdf_status))
@@ -5475,7 +5475,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
#endif #endif
hdd_debug("SOftAP macaddress : " MAC_ADDRESS_STR, hdd_debug("SOftAP macaddress : " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(adapter->mac_addr.bytes)); QDF_MAC_ADDR_ARRAY(adapter->mac_addr.bytes));
hdd_debug("ssid =%s, beaconint=%d, channel=%d", hdd_debug("ssid =%s, beaconint=%d, channel=%d",
config->SSIDinfo.ssid.ssId, (int)config->beacon_int, config->SSIDinfo.ssid.ssId, (int)config->beacon_int,
(int)config->channel); (int)config->channel);

View File

@@ -283,7 +283,7 @@ static void print_mac_list(struct qdf_mac_addr *macList, uint8_t size)
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
macArray = (macList + i)->bytes; macArray = (macList + i)->bytes;
pr_info("ACL entry %i - %02x:%02x:%02x:%02x:%02x:%02x\n", pr_info("ACL entry %i - %02x:%02x:%02x:%02x:%02x:%02x\n",
i, MAC_ADDR_ARRAY(macArray)); i, QDF_MAC_ADDR_ARRAY(macArray));
} }
} }
@@ -391,7 +391,7 @@ static int hdd_set_peer_rate(struct hdd_adapter *adapter, int set_value)
peer_mac = peer_mac =
(uint8_t *)&(adapter->sta_info[aid].sta_mac.bytes[0]); (uint8_t *)&(adapter->sta_info[aid].sta_mac.bytes[0]);
hdd_info("Peer AID: %d MAC_ADDR: "MAC_ADDRESS_STR, hdd_info("Peer AID: %d MAC_ADDR: "MAC_ADDRESS_STR,
aid, MAC_ADDR_ARRAY(peer_mac)); aid, QDF_MAC_ADDR_ARRAY(peer_mac));
} else { } else {
hdd_err("No matching peer found for AID: %d", aid); hdd_err("No matching peer found for AID: %d", aid);
return -EINVAL; return -EINVAL;
@@ -1501,7 +1501,7 @@ int __iw_softap_modify_acl(struct net_device *dev,
cmd = (int)(*(value + i)); cmd = (int)(*(value + i));
hdd_debug("Modify ACL mac:" MAC_ADDRESS_STR " type: %d cmd: %d", hdd_debug("Modify ACL mac:" MAC_ADDRESS_STR " type: %d cmd: %d",
MAC_ADDR_ARRAY(peer_mac), list_type, cmd); QDF_MAC_ADDR_ARRAY(peer_mac), list_type, cmd);
qdf_status = wlansap_modify_acl( qdf_status = wlansap_modify_acl(
WLAN_HDD_GET_SAP_CTX_PTR(adapter), WLAN_HDD_GET_SAP_CTX_PTR(adapter),
@@ -1896,7 +1896,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev,
peer_macaddr = (uint8_t *) (extra); peer_macaddr = (uint8_t *) (extra);
hdd_debug("data " MAC_ADDRESS_STR, hdd_debug("data " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_macaddr)); QDF_MAC_ADDR_ARRAY(peer_macaddr));
wlansap_populate_del_sta_params(peer_macaddr, wlansap_populate_del_sta_params(peer_macaddr,
eSIR_MAC_DEAUTH_LEAVING_BSS_REASON, eSIR_MAC_DEAUTH_LEAVING_BSS_REASON,
(SIR_MAC_MGMT_DISASSOC >> 4), (SIR_MAC_MGMT_DISASSOC >> 4),

View File

@@ -1723,7 +1723,7 @@ static QDF_STATUS hdd_parse_plm_cmd(uint8_t *command,
} }
hdd_debug("MAC addr " MAC_ADDRESS_STR, hdd_debug("MAC addr " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(req->mac_addr.bytes)); QDF_MAC_ADDR_ARRAY(req->mac_addr.bytes));
in_ptr = strpbrk(in_ptr, " "); in_ptr = strpbrk(in_ptr, " ");
@@ -5769,8 +5769,8 @@ static int drv_cmd_max_tx_power(struct hdd_adapter *adapter,
hdd_debug("Device mode %d max tx power %d selfMac: " hdd_debug("Device mode %d max tx power %d selfMac: "
MAC_ADDRESS_STR " bssId: " MAC_ADDRESS_STR, MAC_ADDRESS_STR " bssId: " MAC_ADDRESS_STR,
adapter->device_mode, tx_power, adapter->device_mode, tx_power,
MAC_ADDR_ARRAY(selfmac.bytes), QDF_MAC_ADDR_ARRAY(selfmac.bytes),
MAC_ADDR_ARRAY(bssid.bytes)); QDF_MAC_ADDR_ARRAY(bssid.bytes));
status = sme_set_max_tx_power(hdd_ctx->mac_handle, status = sme_set_max_tx_power(hdd_ctx->mac_handle,
bssid, selfmac, tx_power); bssid, selfmac, tx_power);
@@ -6221,7 +6221,7 @@ static int hdd_set_rx_filter(struct hdd_adapter *adapter, bool action,
hdd_debug("%s RX filter : addr =" hdd_debug("%s RX filter : addr ="
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
action ? "setting" : "clearing", action ? "setting" : "clearing",
MAC_ADDR_ARRAY(filter->multicastAddr[j].bytes)); QDF_MAC_ADDR_ARRAY(filter->multicastAddr[j].bytes));
j++; j++;
} }
if (j == SIR_MAX_NUM_MULTICAST_ADDRESS) if (j == SIR_MAX_NUM_MULTICAST_ADDRESS)

View File

@@ -1216,7 +1216,7 @@ void hdd_update_macaddr(struct hdd_context *hdd_ctx,
hdd_ctx->num_provisioned_addr++; hdd_ctx->num_provisioned_addr++;
hdd_info("hdd_ctx->provisioned_mac_addr[0]: " hdd_info("hdd_ctx->provisioned_mac_addr[0]: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdd_ctx-> QDF_MAC_ADDR_ARRAY(hdd_ctx->
provisioned_mac_addr[0].bytes)); provisioned_mac_addr[0].bytes));
} else { } else {
qdf_mem_copy(hdd_ctx->derived_mac_addr[0].bytes, qdf_mem_copy(hdd_ctx->derived_mac_addr[0].bytes,
@@ -1225,7 +1225,7 @@ void hdd_update_macaddr(struct hdd_context *hdd_ctx,
hdd_ctx->num_derived_addr++; hdd_ctx->num_derived_addr++;
hdd_info("hdd_ctx->derived_mac_addr[0]: " hdd_info("hdd_ctx->derived_mac_addr[0]: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[0].bytes)); QDF_MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[0].bytes));
} }
for (i = hdd_ctx->num_derived_addr; i < (QDF_MAX_CONCURRENCY_PERSONA - for (i = hdd_ctx->num_derived_addr; i < (QDF_MAX_CONCURRENCY_PERSONA -
hdd_ctx->num_provisioned_addr); hdd_ctx->num_provisioned_addr);
@@ -1248,7 +1248,7 @@ void hdd_update_macaddr(struct hdd_context *hdd_ctx,
hdd_ctx->derived_mac_addr[i].bytes[3] = macaddr_b3; hdd_ctx->derived_mac_addr[i].bytes[3] = macaddr_b3;
hdd_info("hdd_ctx->derived_mac_addr[%d]: " hdd_info("hdd_ctx->derived_mac_addr[%d]: "
MAC_ADDRESS_STR, i, MAC_ADDRESS_STR, i,
MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[i].bytes)); QDF_MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[i].bytes));
hdd_ctx->num_derived_addr++; hdd_ctx->num_derived_addr++;
} }
} }
@@ -3458,7 +3458,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr)
return 0; return 0;
hdd_err("%s adapter exist with same address " MAC_ADDRESS_STR, hdd_err("%s adapter exist with same address " MAC_ADDRESS_STR,
adapter_temp->dev->name, adapter_temp->dev->name,
MAC_ADDR_ARRAY(mac_addr.bytes)); QDF_MAC_ADDR_ARRAY(mac_addr.bytes));
return -EINVAL; return -EINVAL;
} }
@@ -3467,7 +3467,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr)
return -EINVAL; return -EINVAL;
hdd_info("Changing MAC to " MAC_ADDRESS_STR " of the interface %s ", hdd_info("Changing MAC to " MAC_ADDRESS_STR " of the interface %s ",
MAC_ADDR_ARRAY(mac_addr.bytes), dev->name); QDF_MAC_ADDR_ARRAY(mac_addr.bytes), dev->name);
hdd_update_dynamic_mac(hdd_ctx, &adapter->mac_addr, &mac_addr); hdd_update_dynamic_mac(hdd_ctx, &adapter->mac_addr, &mac_addr);
memcpy(&adapter->mac_addr, psta_mac_addr->sa_data, ETH_ALEN); memcpy(&adapter->mac_addr, psta_mac_addr->sa_data, ETH_ALEN);
@@ -3513,7 +3513,7 @@ static uint8_t *wlan_hdd_get_derived_intf_addr(struct hdd_context *hdd_ctx)
return NULL; return NULL;
qdf_atomic_set_bit(i, &hdd_ctx->derived_intf_addr_mask); qdf_atomic_set_bit(i, &hdd_ctx->derived_intf_addr_mask);
hdd_info("Assigning MAC from derived list" MAC_ADDRESS_STR, hdd_info("Assigning MAC from derived list" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[i].bytes)); QDF_MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[i].bytes));
/* Copy the mac in dynamic mac list at first free position */ /* Copy the mac in dynamic mac list at first free position */
for (j = 0; j < QDF_MAX_CONCURRENCY_PERSONA; j++) { for (j = 0; j < QDF_MAX_CONCURRENCY_PERSONA; j++) {
@@ -3544,7 +3544,7 @@ static uint8_t *wlan_hdd_get_provisioned_intf_addr(struct hdd_context *hdd_ctx)
return NULL; return NULL;
qdf_atomic_set_bit(i, &hdd_ctx->provisioned_intf_addr_mask); qdf_atomic_set_bit(i, &hdd_ctx->provisioned_intf_addr_mask);
hdd_info("Assigning MAC from provisioned list" MAC_ADDRESS_STR, hdd_info("Assigning MAC from provisioned list" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdd_ctx->provisioned_mac_addr[i].bytes)); QDF_MAC_ADDR_ARRAY(hdd_ctx->provisioned_mac_addr[i].bytes));
/* Copy the mac in dynamic mac list at first free position */ /* Copy the mac in dynamic mac list at first free position */
for (j = 0; j < QDF_MAX_CONCURRENCY_PERSONA; j++) { for (j = 0; j < QDF_MAX_CONCURRENCY_PERSONA; j++) {
@@ -3606,14 +3606,14 @@ void wlan_hdd_release_intf_addr(struct hdd_context *hdd_ctx,
hdd_info("Releasing MAC from provisioned list"); hdd_info("Releasing MAC from provisioned list");
hdd_info( hdd_info(
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(releaseAddr)); QDF_MAC_ADDR_ARRAY(releaseAddr));
} else { } else {
qdf_atomic_clear_bit( qdf_atomic_clear_bit(
mac_pos_in_mask, &hdd_ctx-> mac_pos_in_mask, &hdd_ctx->
derived_intf_addr_mask); derived_intf_addr_mask);
hdd_info("Releasing MAC from derived list"); hdd_info("Releasing MAC from derived list");
hdd_info(MAC_ADDRESS_STR, hdd_info(MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(releaseAddr)); QDF_MAC_ADDR_ARRAY(releaseAddr));
} }
qdf_zero_macaddr(&hdd_ctx-> qdf_zero_macaddr(&hdd_ctx->
dynamic_mac_list[i].dynamic_mac); dynamic_mac_list[i].dynamic_mac);
@@ -3626,7 +3626,7 @@ void wlan_hdd_release_intf_addr(struct hdd_context *hdd_ctx,
} }
if (i == QDF_MAX_CONCURRENCY_PERSONA) if (i == QDF_MAX_CONCURRENCY_PERSONA)
hdd_err("Releasing non existing MAC" MAC_ADDRESS_STR, hdd_err("Releasing non existing MAC" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(releaseAddr)); QDF_MAC_ADDR_ARRAY(releaseAddr));
} }
/** /**
@@ -3692,7 +3692,7 @@ static void __hdd_set_multicast_list(struct net_device *dev)
} }
netdev_for_each_mc_addr(ha, dev) { netdev_for_each_mc_addr(ha, dev) {
hdd_debug("ha_addr[%d] "MAC_ADDRESS_STR, hdd_debug("ha_addr[%d] "MAC_ADDRESS_STR,
i, MAC_ADDR_ARRAY(ha->addr)); i, QDF_MAC_ADDR_ARRAY(ha->addr));
if (i == mc_count) if (i == mc_count)
break; break;
memset(&(mc_list_request->mc_addr[i].bytes), memset(&(mc_list_request->mc_addr[i].bytes),
@@ -5035,7 +5035,7 @@ static void hdd_reset_locally_admin_bit(struct hdd_context *hdd_ctx,
*/ */
WLAN_HDD_RESET_LOCALLY_ADMINISTERED_BIT(mac_addr); WLAN_HDD_RESET_LOCALLY_ADMINISTERED_BIT(mac_addr);
hdd_debug("locally administered bit reset in sta mode: " hdd_debug("locally administered bit reset in sta mode: "
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(mac_addr)); MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(mac_addr));
} }
static void wlan_hdd_cfg80211_scan_block_cb(struct work_struct *work) static void wlan_hdd_cfg80211_scan_block_cb(struct work_struct *work)
@@ -5097,7 +5097,7 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
if (QDF_STATUS_E_FAILURE == status) { if (QDF_STATUS_E_FAILURE == status) {
hdd_err("Duplicate MAC addr: " MAC_ADDRESS_STR hdd_err("Duplicate MAC addr: " MAC_ADDRESS_STR
" already exists", " already exists",
MAC_ADDR_ARRAY(mac_addr)); QDF_MAC_ADDR_ARRAY(mac_addr));
return NULL; return NULL;
} }
@@ -5115,7 +5115,7 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
if (QDF_STATUS_E_FAILURE == status) { if (QDF_STATUS_E_FAILURE == status) {
hdd_err("Duplicate MAC addr: " MAC_ADDRESS_STR hdd_err("Duplicate MAC addr: " MAC_ADDRESS_STR
" already exists", " already exists",
MAC_ADDR_ARRAY(mac_addr)); QDF_MAC_ADDR_ARRAY(mac_addr));
return NULL; return NULL;
} }
} }
@@ -10236,7 +10236,7 @@ void hdd_populate_random_mac_addr(struct hdd_context *hdd_ctx, uint32_t num)
macaddr_b3 ^= (1 << INTF_MACADDR_MASK); macaddr_b3 ^= (1 << INTF_MACADDR_MASK);
buf[0] |= 0x02; buf[0] |= 0x02;
buf[3] = macaddr_b3; buf[3] = macaddr_b3;
hdd_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(buf)); hdd_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(buf));
hdd_ctx->num_derived_addr++; hdd_ctx->num_derived_addr++;
} }
} }
@@ -10277,7 +10277,7 @@ static int hdd_platform_wlan_mac(struct hdd_context *hdd_ctx)
buf = hdd_ctx->provisioned_mac_addr[iter].bytes; buf = hdd_ctx->provisioned_mac_addr[iter].bytes;
qdf_mem_copy(buf, addr, QDF_MAC_ADDR_SIZE); qdf_mem_copy(buf, addr, QDF_MAC_ADDR_SIZE);
hdd_info("provisioned MAC Addr [%d]" MAC_ADDRESS_STR, iter, hdd_info("provisioned MAC Addr [%d]" MAC_ADDRESS_STR, iter,
MAC_ADDR_ARRAY(buf)); QDF_MAC_ADDR_ARRAY(buf));
} }
@@ -10299,7 +10299,7 @@ static int hdd_platform_wlan_mac(struct hdd_context *hdd_ctx)
buf = hdd_ctx->derived_mac_addr[iter].bytes; buf = hdd_ctx->derived_mac_addr[iter].bytes;
qdf_mem_copy(buf, addr, QDF_MAC_ADDR_SIZE); qdf_mem_copy(buf, addr, QDF_MAC_ADDR_SIZE);
hdd_debug("derived MAC Addr [%d]" MAC_ADDRESS_STR, iter, hdd_debug("derived MAC Addr [%d]" MAC_ADDRESS_STR, iter,
MAC_ADDR_ARRAY(buf)); QDF_MAC_ADDR_ARRAY(buf));
} }
hdd_ctx->num_derived_addr = no_of_mac_addr; hdd_ctx->num_derived_addr = no_of_mac_addr;
} }
@@ -14691,7 +14691,7 @@ bool hdd_is_connection_in_progress(uint8_t *out_vdev_id,
&(adapter->mac_addr.bytes[0]); &(adapter->mac_addr.bytes[0]);
hdd_debug("client " MAC_ADDRESS_STR hdd_debug("client " MAC_ADDRESS_STR
" is in middle of WPS/EAPOL exchange.", " is in middle of WPS/EAPOL exchange.",
MAC_ADDR_ARRAY(sta_mac)); QDF_MAC_ADDR_ARRAY(sta_mac));
if (out_vdev_id && out_reason) { if (out_vdev_id && out_reason) {
*out_vdev_id = adapter->vdev_id; *out_vdev_id = adapter->vdev_id;
*out_reason = EAPOL_IN_PROGRESS; *out_reason = EAPOL_IN_PROGRESS;
@@ -14712,7 +14712,7 @@ bool hdd_is_connection_in_progress(uint8_t *out_vdev_id,
sta_mac.bytes[0]); sta_mac.bytes[0]);
hdd_debug("client " MAC_ADDRESS_STR hdd_debug("client " MAC_ADDRESS_STR
" of SAP/GO is in middle of WPS/EAPOL exchange", " of SAP/GO is in middle of WPS/EAPOL exchange",
MAC_ADDR_ARRAY(sta_mac)); QDF_MAC_ADDR_ARRAY(sta_mac));
if (out_vdev_id && out_reason) { if (out_vdev_id && out_reason) {
*out_vdev_id = adapter->vdev_id; *out_vdev_id = adapter->vdev_id;
*out_reason = SAP_EAPOL_IN_PROGRESS; *out_reason = SAP_EAPOL_IN_PROGRESS;

View File

@@ -735,7 +735,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peer_mac,
" to oem app pid(%d), center freq 1 (%d), center freq 2 (%d)," " to oem app pid(%d), center freq 1 (%d), center freq 2 (%d),"
" info (0x%x), frequency (%d),reg info 1 (0x%x)," " info (0x%x), frequency (%d),reg info 1 (0x%x),"
" reg info 2 (0x%x)", " reg info 2 (0x%x)",
MAC_ADDR_ARRAY(peer_mac->bytes), QDF_MAC_ADDR_ARRAY(peer_mac->bytes),
peer_status, peer_capability, peer_status, peer_capability,
vdev_id, peer_info->peer_chan_info.chan_id, vdev_id, peer_info->peer_chan_info.chan_id,
p_hdd_ctx->oem_pid, p_hdd_ctx->oem_pid,

View File

@@ -993,7 +993,7 @@ void __hdd_indicate_mgmt_frame(struct hdd_adapter *adapter,
* we are dropping action frame * we are dropping action frame
*/ */
hdd_err("adapter for action frame is NULL Macaddr = " hdd_err("adapter for action frame is NULL Macaddr = "
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(dest_addr)); MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(dest_addr));
hdd_debug("Frame Type = %d Frame Length = %d subType = %d", hdd_debug("Frame Type = %d Frame Length = %d subType = %d",
frame_type, frm_len, sub_type); frame_type, frm_len, sub_type);
/* /*

View File

@@ -207,7 +207,7 @@ void hdd_rssi_threshold_breached(hdd_handle_t hdd_handle,
hdd_debug("Req Id: %u Current rssi: %d", hdd_debug("Req Id: %u Current rssi: %d",
data->request_id, data->curr_rssi); data->request_id, data->curr_rssi);
hdd_debug("Current BSSID: "MAC_ADDRESS_STR, hdd_debug("Current BSSID: "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(data->curr_bssid.bytes)); QDF_MAC_ADDR_ARRAY(data->curr_bssid.bytes));
if (nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_RSSI_MONITORING_REQUEST_ID, if (nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_RSSI_MONITORING_REQUEST_ID,
data->request_id) || data->request_id) ||

View File

@@ -937,7 +937,7 @@ static int hdd_get_cached_station_remote(struct hdd_context *hdd_ctx,
if (!stainfo) { if (!stainfo) {
hdd_err("peer " MAC_ADDRESS_STR " not found", hdd_err("peer " MAC_ADDRESS_STR " not found",
MAC_ADDR_ARRAY(mac_addr.bytes)); QDF_MAC_ADDR_ARRAY(mac_addr.bytes));
return -EINVAL; return -EINVAL;
} }
@@ -1220,7 +1220,7 @@ __hdd_cfg80211_get_station_cmd(struct wiphy *wiphy,
QDF_MAC_ADDR_SIZE); QDF_MAC_ADDR_SIZE);
hdd_debug("STATION_REMOTE " MAC_ADDRESS_STR, hdd_debug("STATION_REMOTE " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_addr.bytes)); QDF_MAC_ADDR_ARRAY(mac_addr.bytes));
status = hdd_get_station_remote(hdd_ctx, adapter, mac_addr); status = hdd_get_station_remote(hdd_ctx, adapter, mac_addr);
} else { } else {

View File

@@ -571,7 +571,7 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
(!sta_ctx->conn_info.is_authenticated)) { (!sta_ctx->conn_info.is_authenticated)) {
hdd_err("client " MAC_ADDRESS_STR hdd_err("client " MAC_ADDRESS_STR
" is in the middle of WPS/EAPOL exchange.", " is in the middle of WPS/EAPOL exchange.",
MAC_ADDR_ARRAY(adapter->mac_addr.bytes)); QDF_MAC_ADDR_ARRAY(adapter->mac_addr.bytes));
info->state = WIFI_AUTHENTICATING; info->state = WIFI_AUTHENTICATING;
} }
if (eConnectionState_Associated == if (eConnectionState_Associated ==

View File

@@ -8879,7 +8879,7 @@ static int __iw_set_keepalive_params(struct net_device *dev,
request->destIpv4Addr[2], request->destIpv4Addr[3]); request->destIpv4Addr[2], request->destIpv4Addr[3]);
hdd_debug("Dest MAC address: "MAC_ADDRESS_STR, hdd_debug("Dest MAC address: "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(request->dest_macaddr.bytes)); QDF_MAC_ADDR_ARRAY(request->dest_macaddr.bytes));
break; break;
} }

View File

@@ -274,7 +274,7 @@ tpDphHashNode dph_add_hash_entry(struct mac_context *mac, tSirMacAddr staAddr,
pe_debug("assocId %d index %d STA addr", pe_debug("assocId %d index %d STA addr",
assocId, index); assocId, index);
pe_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(staAddr)); pe_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(staAddr));
if (assocId >= hash_table->size) { if (assocId >= hash_table->size) {
pe_err("invalid STA id %d", assocId); pe_err("invalid STA id %d", assocId);
@@ -346,7 +346,7 @@ QDF_STATUS dph_delete_hash_entry(struct mac_context *mac, tSirMacAddr staAddr,
uint16_t index = hash_function(mac, staAddr, hash_table->size); uint16_t index = hash_function(mac, staAddr, hash_table->size);
pe_debug("assocId %d index %d STA addr", assocId, index); pe_debug("assocId %d index %d STA addr", assocId, index);
pe_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(staAddr)); pe_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(staAddr));
if (assocId >= hash_table->size) { if (assocId >= hash_table->size) {
pe_err("invalid STA id %d", assocId); pe_err("invalid STA id %d", assocId);
@@ -384,7 +384,7 @@ QDF_STATUS dph_delete_hash_entry(struct mac_context *mac, tSirMacAddr staAddr,
ptr->next = 0; ptr->next = 0;
} else { } else {
pe_err("Entry not present STA addr"); pe_err("Entry not present STA addr");
pe_err(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(staAddr)); pe_err(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(staAddr));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011-2012, 2014-2015, 2017-2018 The Linux Foundation. All * Copyright (c) 2011-2012, 2014-2015, 2017-2019 The Linux Foundation. All
* rights reserved. * rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
@@ -35,7 +35,6 @@
#define LOG4 7 #define LOG4 7
#define LOGD 8 #define LOGD 8
#define MAC_ADDR_ARRAY(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
#define MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x" #define MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x"
#define pe_alert_rl(params...) QDF_TRACE_FATAL_RL(QDF_MODULE_ID_PE, params) #define pe_alert_rl(params...) QDF_TRACE_FATAL_RL(QDF_MODULE_ID_PE, params)

View File

@@ -695,7 +695,7 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr,
pe_debug("Sessionid: %d staDsAssocId: %d Trigger: %d statusCode: %d sta_dsaddr: "MAC_ADDRESS_STR, pe_debug("Sessionid: %d staDsAssocId: %d Trigger: %d statusCode: %d sta_dsaddr: "MAC_ADDRESS_STR,
pe_session->peSessionId, staDsAssocId, pe_session->peSessionId, staDsAssocId,
mlmStaContext.cleanupTrigger, statusCode, mlmStaContext.cleanupTrigger, statusCode,
MAC_ADDR_ARRAY(sta_dsaddr.bytes)); QDF_MAC_ADDR_ARRAY(sta_dsaddr.bytes));
if (LIM_IS_STA_ROLE(pe_session)) { if (LIM_IS_STA_ROLE(pe_session)) {
/* Set BSSID at CFG to null */ /* Set BSSID at CFG to null */
@@ -895,7 +895,7 @@ lim_reject_association(struct mac_context *mac_ctx, tSirMacAddr peer_addr,
pe_debug("Sessionid: %d auth_type: %d sub_type: %d add_pre_auth_context: %d sta_id: %d delete_sta: %d result_code : %d peer_addr: " MAC_ADDRESS_STR, pe_debug("Sessionid: %d auth_type: %d sub_type: %d add_pre_auth_context: %d sta_id: %d delete_sta: %d result_code : %d peer_addr: " MAC_ADDRESS_STR,
session_entry->peSessionId, auth_type, sub_type, session_entry->peSessionId, auth_type, sub_type,
add_pre_auth_context, sta_id, delete_sta, result_code, add_pre_auth_context, sta_id, delete_sta, result_code,
MAC_ADDR_ARRAY(peer_addr)); QDF_MAC_ADDR_ARRAY(peer_addr));
if (add_pre_auth_context) { if (add_pre_auth_context) {
/* Create entry for this STA in pre-auth list */ /* Create entry for this STA in pre-auth list */
@@ -2151,7 +2151,7 @@ lim_add_sta(struct mac_context *mac_ctx,
sta_Addr = &sta_mac; sta_Addr = &sta_mac;
pe_debug(MAC_ADDRESS_STR ": Subtype(Assoc/Reassoc): %d", pe_debug(MAC_ADDRESS_STR ": Subtype(Assoc/Reassoc): %d",
MAC_ADDR_ARRAY(*sta_Addr), sta_ds->mlmStaContext.subType); QDF_MAC_ADDR_ARRAY(*sta_Addr), sta_ds->mlmStaContext.subType);
qdf_mem_copy((uint8_t *) add_sta_params->staMac, qdf_mem_copy((uint8_t *) add_sta_params->staMac,
(uint8_t *) *sta_Addr, sizeof(tSirMacAddr)); (uint8_t *) *sta_Addr, sizeof(tSirMacAddr));
@@ -2683,7 +2683,7 @@ lim_del_sta(struct mac_context *mac,
"for STAID: %X and AssocID: %d MAC : " "for STAID: %X and AssocID: %d MAC : "
MAC_ADDRESS_STR, pDelStaParams->sessionId, MAC_ADDRESS_STR, pDelStaParams->sessionId,
pDelStaParams->staIdx, pDelStaParams->assocId, pDelStaParams->staIdx, pDelStaParams->assocId,
MAC_ADDR_ARRAY(sta->staAddr)); QDF_MAC_ADDR_ARRAY(sta->staAddr));
MTRACE(mac_trace_msg_tx(mac, pe_session->peSessionId, msgQ.type)); MTRACE(mac_trace_msg_tx(mac, pe_session->peSessionId, msgQ.type));
retCode = wma_post_ctrl_msg(mac, &msgQ); retCode = wma_post_ctrl_msg(mac, &msgQ);
@@ -2744,7 +2744,7 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta,
(int)mac->roam.configParam.uCfgDot11Mode); (int)mac->roam.configParam.uCfgDot11Mode);
sir_copy_mac_addr(staMac, pe_session->selfMacAddr); sir_copy_mac_addr(staMac, pe_session->selfMacAddr);
pe_debug(MAC_ADDRESS_STR ": ", MAC_ADDR_ARRAY(staMac)); pe_debug(MAC_ADDRESS_STR ": ", QDF_MAC_ADDR_ARRAY(staMac));
pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams)); pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams));
if (!pAddStaParams) if (!pAddStaParams)
return QDF_STATUS_E_NOMEM; return QDF_STATUS_E_NOMEM;
@@ -2902,7 +2902,7 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta,
pe_debug(MAC_ADDRESS_STR ":Sessionid %d : " pe_debug(MAC_ADDRESS_STR ":Sessionid %d : "
"Sending WMA_ADD_STA_REQ. (aid %d)", "Sending WMA_ADD_STA_REQ. (aid %d)",
MAC_ADDR_ARRAY(pAddStaParams->staMac), QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac),
pAddStaParams->sessionId, pAddStaParams->assocId); pAddStaParams->sessionId, pAddStaParams->assocId);
MTRACE(mac_trace_msg_tx(mac, pe_session->peSessionId, msgQ.type)); MTRACE(mac_trace_msg_tx(mac, pe_session->peSessionId, msgQ.type));
@@ -3371,7 +3371,7 @@ lim_del_bss(struct mac_context *mac, tpDphHashNode sta, uint16_t bssIdx,
pe_debug("Sessionid %d : Sending HAL_DELETE_BSS_REQ " pe_debug("Sessionid %d : Sending HAL_DELETE_BSS_REQ "
"for bss idx: %X BSSID:" MAC_ADDRESS_STR, "for bss idx: %X BSSID:" MAC_ADDRESS_STR,
pDelBssParams->sessionId, pDelBssParams->bssIdx, pDelBssParams->sessionId, pDelBssParams->bssIdx,
MAC_ADDR_ARRAY(pe_session->bssId)); QDF_MAC_ADDR_ARRAY(pe_session->bssId));
/* we need to defer the message until we get the response back from HAL. */ /* we need to defer the message until we get the response back from HAL. */
SET_LIM_PROCESS_DEFD_MESGS(mac, false); SET_LIM_PROCESS_DEFD_MESGS(mac, false);
@@ -3568,7 +3568,8 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
pe_session->smeSessionId, updateEntry, pe_session->smeSessionId, updateEntry,
GET_LIM_SYSTEM_ROLE(pe_session)); GET_LIM_SYSTEM_ROLE(pe_session));
pe_debug("BSSID: " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pAddBssParams->bssId)); pe_debug("BSSID: " MAC_ADDRESS_STR,
QDF_MAC_ADDR_ARRAY(pAddBssParams->bssId));
pAddBssParams->bssType = eSIR_INFRASTRUCTURE_MODE; pAddBssParams->bssType = eSIR_INFRASTRUCTURE_MODE;
@@ -3743,7 +3744,7 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
if (!sta) { if (!sta) {
pe_err("Couldn't get assoc id for " "MAC ADDR: " pe_err("Couldn't get assoc id for " "MAC ADDR: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
pAddBssParams->staContext.staMac)); pAddBssParams->staContext.staMac));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -3758,7 +3759,7 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
pe_debug("StaContext: " MAC_ADDRESS_STR pe_debug("StaContext: " MAC_ADDRESS_STR
" shortPreambleSupported: %d", " shortPreambleSupported: %d",
MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac), QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac),
pAddBssParams->staContext.shortPreambleSupported); pAddBssParams->staContext.shortPreambleSupported);
if (IS_DOT11_MODE_HT(pe_session->dot11mode) if (IS_DOT11_MODE_HT(pe_session->dot11mode)
@@ -4113,7 +4114,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat
GET_LIM_SYSTEM_ROLE(pe_session)); GET_LIM_SYSTEM_ROLE(pe_session));
pe_debug("BSSID: " MAC_ADDRESS_STR, pe_debug("BSSID: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pAddBssParams->bssId)); QDF_MAC_ADDR_ARRAY(pAddBssParams->bssId));
/* Incorrect BSS Type which caused UMA Descriptor to be overwritten on /* Incorrect BSS Type which caused UMA Descriptor to be overwritten on
* top of an already established Infra link. This lead to issues in * top of an already established Infra link. This lead to issues in
* concurrent data transfer. * concurrent data transfer.
@@ -4295,7 +4296,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat
pAddBssParams->staContext.updateSta = updateEntry; pAddBssParams->staContext.updateSta = updateEntry;
pe_debug("StaCtx: " MAC_ADDRESS_STR " shortPreamble: %d", pe_debug("StaCtx: " MAC_ADDRESS_STR " shortPreamble: %d",
MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac), QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac),
pAddBssParams->staContext.shortPreambleSupported); pAddBssParams->staContext.shortPreambleSupported);
pAddBssParams->dot11_mode = pe_session->dot11mode; pAddBssParams->dot11_mode = pe_session->dot11mode;

View File

@@ -809,7 +809,7 @@ bool lim_process_ft_update_key(struct mac_context *mac, uint32_t *pMsgBuf)
pAddBssParams->extSetStaKeyParam.staIdx = 0; pAddBssParams->extSetStaKeyParam.staIdx = 0;
pe_debug("BSSID: " MAC_ADDRESS_STR, pe_debug("BSSID: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pKeyInfo->bssid.bytes)); QDF_MAC_ADDR_ARRAY(pKeyInfo->bssid.bytes));
qdf_copy_macaddr(&pAddBssParams->extSetStaKeyParam.peer_macaddr, qdf_copy_macaddr(&pAddBssParams->extSetStaKeyParam.peer_macaddr,
&pKeyInfo->bssid); &pKeyInfo->bssid);

View File

@@ -143,7 +143,7 @@ int lim_process_ft_pre_auth_req(struct mac_context *mac_ctx,
if (!session) { if (!session) {
pe_err("Unable to find session for the bssid" pe_err("Unable to find session for the bssid"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(ft_pre_auth_req->currbssId)); QDF_MAC_ADDR_ARRAY(ft_pre_auth_req->currbssId));
/* Post the FT Pre Auth Response to SME */ /* Post the FT Pre Auth Response to SME */
lim_post_ft_pre_auth_rsp(mac_ctx, QDF_STATUS_E_FAILURE, NULL, 0, lim_post_ft_pre_auth_rsp(mac_ctx, QDF_STATUS_E_FAILURE, NULL, 0,
session); session);

View File

@@ -1050,7 +1050,7 @@ lim_ibss_search_and_delete_peer(struct mac_context *mac_ctx,
prev_node = temp_node = mac_ctx->lim.gLimIbssPeerList; prev_node = temp_node = mac_ctx->lim.gLimIbssPeerList;
pe_debug(" PEER ADDR :" MAC_ADDRESS_STR, pe_debug(" PEER ADDR :" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_addr)); QDF_MAC_ADDR_ARRAY(mac_addr));
/** Compare Peer */ /** Compare Peer */
while (temp_node) { while (temp_node) {
@@ -1110,7 +1110,7 @@ lim_ibss_delete_peer(struct mac_context *mac_ctx,
uint16_t peer_idx = 0; uint16_t peer_idx = 0;
pe_debug("Delete peer :" MAC_ADDRESS_STR, pe_debug("Delete peer :" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_addr)); QDF_MAC_ADDR_ARRAY(mac_addr));
sta = dph_lookup_hash_entry(mac_ctx, mac_addr, sta = dph_lookup_hash_entry(mac_ctx, mac_addr,
&peer_idx, &peer_idx,
@@ -1176,7 +1176,7 @@ void lim_process_ibss_del_sta_rsp(struct mac_context *mac_ctx,
} }
pe_debug("Deleted STA associd %d staId %d MAC " MAC_ADDRESS_STR, pe_debug("Deleted STA associd %d staId %d MAC " MAC_ADDRESS_STR,
sta_ds->assocId, sta_ds->staIndex, sta_ds->assocId, sta_ds->staIndex,
MAC_ADDR_ARRAY(sta_ds->staAddr)); QDF_MAC_ADDR_ARRAY(sta_ds->staAddr));
lim_delete_dph_hash_entry(mac_ctx, sta_ds->staAddr, lim_delete_dph_hash_entry(mac_ctx, sta_ds->staAddr,
del_sta_params->assocId, pe_session); del_sta_params->assocId, pe_session);
@@ -1216,7 +1216,7 @@ lim_ibss_add_sta_rsp(struct mac_context *mac, void *msg, struct pe_session *pe_s
&pe_session->dph.dphHashTable); &pe_session->dph.dphHashTable);
if (!sta) { if (!sta) {
pe_err("IBSS: ADD_STA_RSP for unknown MAC addr: "MAC_ADDRESS_STR, pe_err("IBSS: ADD_STA_RSP for unknown MAC addr: "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pAddStaParams->staMac)); QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac));
qdf_mem_free(pAddStaParams); qdf_mem_free(pAddStaParams);
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -1224,7 +1224,7 @@ lim_ibss_add_sta_rsp(struct mac_context *mac, void *msg, struct pe_session *pe_s
if (pAddStaParams->status != QDF_STATUS_SUCCESS) { if (pAddStaParams->status != QDF_STATUS_SUCCESS) {
pe_err("IBSS: ADD_STA_RSP error: %x for MAC:"MAC_ADDRESS_STR, pe_err("IBSS: ADD_STA_RSP error: %x for MAC:"MAC_ADDRESS_STR,
pAddStaParams->status, pAddStaParams->status,
MAC_ADDR_ARRAY(pAddStaParams->staMac)); QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac));
lim_ibss_delete_peer(mac, lim_ibss_delete_peer(mac,
pe_session, pAddStaParams->staMac); pe_session, pAddStaParams->staMac);
qdf_mem_free(pAddStaParams); qdf_mem_free(pAddStaParams);
@@ -1449,8 +1449,8 @@ lim_ibss_coalesce(struct mac_context *mac,
sir_copy_mac_addr(currentBssId, pe_session->bssId); sir_copy_mac_addr(currentBssId, pe_session->bssId);
pe_debug("Current BSSID :" MAC_ADDRESS_STR " Received BSSID :" pe_debug("Current BSSID :" MAC_ADDRESS_STR " Received BSSID :"
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(currentBssId), MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(currentBssId),
MAC_ADDR_ARRAY(pHdr->bssId)); QDF_MAC_ADDR_ARRAY(pHdr->bssId));
/* Check for IBSS Coalescing only if Beacon is from different BSS */ /* Check for IBSS Coalescing only if Beacon is from different BSS */
if (qdf_mem_cmp(currentBssId, pHdr->bssId, sizeof(tSirMacAddr)) if (qdf_mem_cmp(currentBssId, pHdr->bssId, sizeof(tSirMacAddr))
@@ -1485,7 +1485,7 @@ lim_ibss_coalesce(struct mac_context *mac,
mac->lim.gLimIbssCoalescingHappened = true; mac->lim.gLimIbssCoalescingHappened = true;
ibss_coalesce_save(mac, pHdr, pBeacon); ibss_coalesce_save(mac, pHdr, pBeacon);
pe_debug("IBSS Coalescing happened Delete BSSID :" MAC_ADDRESS_STR, pe_debug("IBSS Coalescing happened Delete BSSID :" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(currentBssId)); QDF_MAC_ADDR_ARRAY(currentBssId));
lim_ibss_bss_delete(mac, pe_session); lim_ibss_bss_delete(mac, pe_session);
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;

View File

@@ -148,7 +148,7 @@ static void lim_delete_sta_util(struct mac_context *mac_ctx, tpDeleteStaContext
"STA that either has no context or " "STA that either has no context or "
"in some transit state, Addr = " "in some transit state, Addr = "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(msg->bssId)); QDF_MAC_ADDR_ARRAY(msg->bssId));
return; return;
} }
@@ -422,7 +422,7 @@ lim_tear_down_link_with_ap(struct mac_context *mac, uint8_t sessionId,
pe_debug("HB Failure on MAC " pe_debug("HB Failure on MAC "
MAC_ADDRESS_STR" Store it on Index %d", MAC_ADDRESS_STR" Store it on Index %d",
MAC_ADDR_ARRAY(sta->staAddr), apCount); QDF_MAC_ADDR_ARRAY(sta->staAddr), apCount);
sir_copy_mac_addr(mac->lim.gLimHeartBeatApMac[apCount], sir_copy_mac_addr(mac->lim.gLimHeartBeatApMac[apCount],
sta->staAddr); sta->staAddr);

View File

@@ -175,7 +175,7 @@ static QDF_STATUS lim_check_sta_in_pe_entries(struct mac_context *mac_ctx,
sta_ds->sta_deletion_in_progress = true; sta_ds->sta_deletion_in_progress = true;
pe_err("Sending Disassoc and Deleting existing STA entry:" pe_err("Sending Disassoc and Deleting existing STA entry:"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(session->selfMacAddr)); QDF_MAC_ADDR_ARRAY(session->selfMacAddr));
lim_send_disassoc_mgmt_frame(mac_ctx, lim_send_disassoc_mgmt_frame(mac_ctx,
eSIR_MAC_UNSPEC_FAILURE_REASON, eSIR_MAC_UNSPEC_FAILURE_REASON,
(uint8_t *) hdr->sa, session, false); (uint8_t *) hdr->sa, session, false);
@@ -285,7 +285,7 @@ static bool lim_chk_assoc_req_parse_error(struct mac_context *mac_ctx,
return true; return true;
pe_warn("Assoc Req rejected: frame parsing error. source addr:" pe_warn("Assoc Req rejected: frame parsing error. source addr:"
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(hdr->sa)); MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(hdr->sa));
lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS, lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS,
1, hdr->sa, sub_type, 0, session); 1, hdr->sa, sub_type, 0, session);
return false; return false;
@@ -323,7 +323,7 @@ static bool lim_chk_capab(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
pe_warn("Rcvd %s Req with unsupported capab from" pe_warn("Rcvd %s Req with unsupported capab from"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
/* /*
* Capabilities of requesting STA does not match with * Capabilities of requesting STA does not match with
* local capabilities. Respond with 'unsupported capabilities' * local capabilities. Respond with 'unsupported capabilities'
@@ -361,7 +361,7 @@ static bool lim_chk_ssid(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
assoc_req->ssId.length, assoc_req->ssId.ssId, assoc_req->ssId.length, assoc_req->ssId.ssId,
session->ssId.length, session->ssId.ssId, session->ssId.length, session->ssId.ssId,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
/* /*
* Received Re/Association Request with either Broadcast SSID OR with * Received Re/Association Request with either Broadcast SSID OR with
@@ -416,7 +416,7 @@ static bool lim_chk_rates(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
pe_warn("Assoc Req rejected: unsupported rates, soruce addr: %s" pe_warn("Assoc Req rejected: unsupported rates, soruce addr: %s"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
/* /*
* Requesting STA does not support ALL BSS basic rates. Respond with * Requesting STA does not support ALL BSS basic rates. Respond with
* 'basic rates not supported' status code. * 'basic rates not supported' status code.
@@ -448,7 +448,7 @@ static bool lim_chk_11g_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
(assoc_req->HTCaps.present)) { (assoc_req->HTCaps.present)) {
pe_err("SOFTAP was in 11G only mode, rejecting legacy STA: " pe_err("SOFTAP was in 11G only mode, rejecting legacy STA: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
lim_send_assoc_rsp_mgmt_frame(mac_ctx, lim_send_assoc_rsp_mgmt_frame(mac_ctx,
eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,
1, hdr->sa, sub_type, 0, session); 1, hdr->sa, sub_type, 0, session);
@@ -478,7 +478,7 @@ static bool lim_chk_11n_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
(!assoc_req->HTCaps.present)) { (!assoc_req->HTCaps.present)) {
pe_err("SOFTAP was in 11N only mode, rejecting legacy STA: " pe_err("SOFTAP was in 11N only mode, rejecting legacy STA: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
lim_send_assoc_rsp_mgmt_frame(mac_ctx, lim_send_assoc_rsp_mgmt_frame(mac_ctx,
eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS,
1, hdr->sa, sub_type, 0, session); 1, hdr->sa, sub_type, 0, session);
@@ -647,14 +647,14 @@ lim_process_for_spectrum_mgmt(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
(LIM_ASSOC == sub_type) ? (LIM_ASSOC == sub_type) ?
"Assoc" : "ReAssoc", "Assoc" : "ReAssoc",
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
} }
if (!assoc_req->supportedChannelsPresent) { if (!assoc_req->supportedChannelsPresent) {
pe_warn("LIM Info: Missing Supported channel IE in %s Req from " pe_warn("LIM Info: Missing Supported channel IE in %s Req from "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
(LIM_ASSOC == sub_type) ? (LIM_ASSOC == sub_type) ?
"Assoc" : "ReAssoc", "Assoc" : "ReAssoc",
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
} }
} else { } else {
/* Assoc request has mandatory fields */ /* Assoc request has mandatory fields */
@@ -666,7 +666,7 @@ lim_process_for_spectrum_mgmt(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
(LIM_ASSOC == sub_type) ? (LIM_ASSOC == sub_type) ?
"Assoc" : "ReAssoc", "Assoc" : "ReAssoc",
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
} }
status = lim_is_dot11h_supported_channels_valid( status = lim_is_dot11h_supported_channels_valid(
mac_ctx, assoc_req); mac_ctx, assoc_req);
@@ -675,7 +675,7 @@ lim_process_for_spectrum_mgmt(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
(LIM_ASSOC == sub_type) ? (LIM_ASSOC == sub_type) ?
"Assoc" : "ReAssoc", "Assoc" : "ReAssoc",
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
} }
/* IEs are valid, use them if needed */ /* IEs are valid, use them if needed */
} }
@@ -720,7 +720,7 @@ static bool lim_chk_mcs(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
pe_warn("rcvd %s req with unsupported MCS Rate Set from " pe_warn("rcvd %s req with unsupported MCS Rate Set from "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
/* /*
* Requesting STA does not support ALL BSS MCS basic Rate set * Requesting STA does not support ALL BSS MCS basic Rate set
* rates. Spec does not define any status code for this * rates. Spec does not define any status code for this
@@ -972,13 +972,13 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
qdf_mem_zero((uint8_t *) &dot11f_ie_rsn, sizeof(dot11f_ie_rsn)); qdf_mem_zero((uint8_t *) &dot11f_ie_rsn, sizeof(dot11f_ie_rsn));
qdf_mem_zero((uint8_t *) &dot11f_ie_wpa, sizeof(dot11f_ie_wpa)); qdf_mem_zero((uint8_t *) &dot11f_ie_wpa, sizeof(dot11f_ie_wpa));
pe_err("RSN enabled auth, Re/Assoc req from STA: " pe_err("RSN enabled auth, Re/Assoc req from STA: "
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(hdr->sa)); MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(hdr->sa));
if (assoc_req->rsnPresent) { if (assoc_req->rsnPresent) {
if (!(assoc_req->rsn.length)) { if (!(assoc_req->rsn.length)) {
pe_warn("Re/Assoc rejected from: " pe_warn("Re/Assoc rejected from: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
/* /*
* rcvd Assoc req frame with RSN IE but * rcvd Assoc req frame with RSN IE but
* length is zero * length is zero
@@ -1011,7 +1011,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
if (eSIR_MAC_SUCCESS_STATUS != status) { if (eSIR_MAC_SUCCESS_STATUS != status) {
pe_warn("Re/Assoc rejected from: " pe_warn("Re/Assoc rejected from: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
lim_send_assoc_rsp_mgmt_frame(mac_ctx, status, lim_send_assoc_rsp_mgmt_frame(mac_ctx, status,
1, hdr->sa, sub_type, 1, hdr->sa, sub_type,
@@ -1020,7 +1020,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
} }
} else { } else {
pe_warn("Re/Assoc rejected from: " MAC_ADDRESS_STR, pe_warn("Re/Assoc rejected from: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
/* /*
* rcvd Assoc req frame with RSN IE but * rcvd Assoc req frame with RSN IE but
* IE version is wrong * IE version is wrong
@@ -1038,7 +1038,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
if (eSIR_MAC_SUCCESS_STATUS != status) { if (eSIR_MAC_SUCCESS_STATUS != status) {
/* Reject pmf disable SAE STA */ /* Reject pmf disable SAE STA */
pe_warn("Re/Assoc rejected from: " MAC_ADDRESS_STR, pe_warn("Re/Assoc rejected from: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
lim_send_assoc_rsp_mgmt_frame(mac_ctx, status, lim_send_assoc_rsp_mgmt_frame(mac_ctx, status,
1, hdr->sa, sub_type, 1, hdr->sa, sub_type,
0, session); 0, session);
@@ -1049,7 +1049,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
if (!(assoc_req->wpa.length)) { if (!(assoc_req->wpa.length)) {
pe_warn("Re/Assoc rejected from: " pe_warn("Re/Assoc rejected from: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
/* rcvd Assoc req frame with invalid WPA IE length */ /* rcvd Assoc req frame with invalid WPA IE length */
lim_send_assoc_rsp_mgmt_frame(mac_ctx, lim_send_assoc_rsp_mgmt_frame(mac_ctx,
@@ -1076,7 +1076,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
if (eSIR_MAC_SUCCESS_STATUS != status) { if (eSIR_MAC_SUCCESS_STATUS != status) {
pe_warn("Re/Assoc rejected from: " pe_warn("Re/Assoc rejected from: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
/* /*
* rcvd Assoc req frame with WPA IE * rcvd Assoc req frame with WPA IE
* but there is mismatch * but there is mismatch
@@ -1192,7 +1192,7 @@ static bool lim_process_assoc_req_no_sta_ctx(struct mac_context *mac_ctx,
pe_warn("rcvd %s req, sessionid: %d, without pre-auth ctx" pe_warn("rcvd %s req, sessionid: %d, without pre-auth ctx"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
session->peSessionId, MAC_ADDR_ARRAY(hdr->sa)); session->peSessionId, QDF_MAC_ADDR_ARRAY(hdr->sa));
return false; return false;
} }
/* Delete 'pre-auth' context of STA */ /* Delete 'pre-auth' context of STA */
@@ -1647,7 +1647,7 @@ static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
/* Could not update hash table entry at DPH with rateset */ /* Could not update hash table entry at DPH with rateset */
pe_err("Couldn't update hash entry for aid: %d MacAddr: " pe_err("Couldn't update hash entry for aid: %d MacAddr: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
peer_idx, MAC_ADDR_ARRAY(hdr->sa)); peer_idx, QDF_MAC_ADDR_ARRAY(hdr->sa));
/* Release AID */ /* Release AID */
lim_release_peer_idx(mac_ctx, peer_idx, session); lim_release_peer_idx(mac_ctx, peer_idx, session);
@@ -2007,7 +2007,7 @@ bool lim_send_assoc_ind_to_sme(struct mac_context *mac_ctx,
/* STA is Associated ! */ /* STA is Associated ! */
pe_debug("Received: %s Req successful from " MAC_ADDRESS_STR, pe_debug("Received: %s Req successful from " MAC_ADDRESS_STR,
(sub_type == LIM_ASSOC) ? "Assoc" : "ReAssoc", (sub_type == LIM_ASSOC) ? "Assoc" : "ReAssoc",
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
/* /*
* AID for this association will be same as the peer Index used in DPH * AID for this association will be same as the peer Index used in DPH
@@ -2036,7 +2036,7 @@ bool lim_send_assoc_ind_to_sme(struct mac_context *mac_ctx,
if (!sta_ds) { if (!sta_ds) {
/* Could not add hash table entry at DPH */ /* Could not add hash table entry at DPH */
pe_err("couldn't add hash entry at DPH for aid: %d MacAddr:" pe_err("couldn't add hash entry at DPH for aid: %d MacAddr:"
MAC_ADDRESS_STR, peer_idx, MAC_ADDR_ARRAY(hdr->sa)); MAC_ADDRESS_STR, peer_idx, QDF_MAC_ADDR_ARRAY(hdr->sa));
/* Release AID */ /* Release AID */
lim_release_peer_idx(mac_ctx, peer_idx, session); lim_release_peer_idx(mac_ctx, peer_idx, session);
@@ -2123,14 +2123,14 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
session->peSessionId, GET_LIM_SYSTEM_ROLE(session), session->peSessionId, GET_LIM_SYSTEM_ROLE(session),
session->limMlmState, MAC_ADDR_ARRAY(hdr->sa)); session->limMlmState, QDF_MAC_ADDR_ARRAY(hdr->sa));
if (LIM_IS_STA_ROLE(session)) { if (LIM_IS_STA_ROLE(session)) {
pe_err("Rcvd unexpected ASSOC REQ, sessionid: %d sys sub_type: %d for role: %d from: " pe_err("Rcvd unexpected ASSOC REQ, sessionid: %d sys sub_type: %d for role: %d from: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
session->peSessionId, sub_type, session->peSessionId, sub_type,
GET_LIM_SYSTEM_ROLE(session), GET_LIM_SYSTEM_ROLE(session),
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
WMA_GET_RX_MPDU_DATA(rx_pkt_info), WMA_GET_RX_MPDU_DATA(rx_pkt_info),
frame_len); frame_len);
@@ -2141,7 +2141,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
"role: %d from: "MAC_ADDRESS_STR" in limMlmState: %d", "role: %d from: "MAC_ADDRESS_STR" in limMlmState: %d",
session->peSessionId, session->peSessionId,
GET_LIM_SYSTEM_ROLE(session), GET_LIM_SYSTEM_ROLE(session),
MAC_ADDR_ARRAY(hdr->sa), QDF_MAC_ADDR_ARRAY(hdr->sa),
eLIM_MLM_WT_DEL_BSS_RSP_STATE); eLIM_MLM_WT_DEL_BSS_RSP_STATE);
return; return;
} }
@@ -2160,7 +2160,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
pe_err("STA is initiating Assoc Req after ACK lost. Do not process sessionid: %d sys sub_type=%d for role=%d from: " pe_err("STA is initiating Assoc Req after ACK lost. Do not process sessionid: %d sys sub_type=%d for role=%d from: "
MAC_ADDRESS_STR, session->peSessionId, MAC_ADDRESS_STR, session->peSessionId,
sub_type, GET_LIM_SYSTEM_ROLE(session), sub_type, GET_LIM_SYSTEM_ROLE(session),
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
return; return;
} else if (!sta_ds->rmfEnabled && (sub_type == LIM_REASSOC)) { } else if (!sta_ds->rmfEnabled && (sub_type == LIM_REASSOC)) {
/* /*
@@ -2190,7 +2190,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
session->peSessionId, sub_type, session->peSessionId, sub_type,
session->limSystemRole, session->limSystemRole,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
return; return;
} }
} }
@@ -2224,7 +2224,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
pe_err("Rcvd: %s Req, sessionid: %d from a BC/MC address" pe_err("Rcvd: %s Req, sessionid: %d from a BC/MC address"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
(LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc",
session->peSessionId, MAC_ADDR_ARRAY(hdr->sa)); session->peSessionId, QDF_MAC_ADDR_ARRAY(hdr->sa));
return; return;
} }
@@ -2578,7 +2578,7 @@ void lim_send_mlm_assoc_ind(struct mac_context *mac_ctx,
pe_debug("Sessionid: %d ssid: %s sub_type: %d Associd: %d staAddr: " pe_debug("Sessionid: %d ssid: %s sub_type: %d Associd: %d staAddr: "
MAC_ADDRESS_STR, session_entry->peSessionId, MAC_ADDRESS_STR, session_entry->peSessionId,
assoc_req->ssId.ssId, sub_type, sta_ds->assocId, assoc_req->ssId.ssId, sub_type, sta_ds->assocId,
MAC_ADDR_ARRAY(sta_ds->staAddr)); QDF_MAC_ADDR_ARRAY(sta_ds->staAddr));
if (sub_type == LIM_ASSOC || sub_type == LIM_REASSOC) { if (sub_type == LIM_ASSOC || sub_type == LIM_REASSOC) {
temp = sizeof(tLimMlmAssocInd); temp = sizeof(tLimMlmAssocInd);

View File

@@ -518,7 +518,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
session_entry->peSessionId, GET_LIM_SYSTEM_ROLE(session_entry), session_entry->peSessionId, GET_LIM_SYSTEM_ROLE(session_entry),
session_entry->limMlmState, session_entry->limMlmState,
(uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info)), (uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info)),
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
beacon = qdf_mem_malloc(sizeof(tSchBeaconStruct)); beacon = qdf_mem_malloc(sizeof(tSchBeaconStruct));
if (!beacon) if (!beacon)
@@ -574,7 +574,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
* Ignore this and wait until Assoc Failure Timeout * Ignore this and wait until Assoc Failure Timeout
*/ */
pe_warn("received AssocRsp from unexpected peer "MAC_ADDRESS_STR, pe_warn("received AssocRsp from unexpected peer "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
qdf_mem_free(beacon); qdf_mem_free(beacon);
return; return;
} }
@@ -588,7 +588,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
* Ignore this and wait until Reassoc Failure Timeout. * Ignore this and wait until Reassoc Failure Timeout.
*/ */
pe_warn("received ReassocRsp from unexpected peer "MAC_ADDRESS_STR, pe_warn("received ReassocRsp from unexpected peer "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
qdf_mem_free(beacon); qdf_mem_free(beacon);
return; return;
} }
@@ -939,7 +939,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx,
return; return;
} }
pe_debug("Successfully Associated with BSS " MAC_ADDRESS_STR, pe_debug("Successfully Associated with BSS " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(hdr->sa)); QDF_MAC_ADDR_ARRAY(hdr->sa));
#ifdef FEATURE_WLAN_ESE #ifdef FEATURE_WLAN_ESE
if (session_entry->eseContext.tsm.tsmInfo.state) if (session_entry->eseContext.tsm.tsmInfo.state)
session_entry->eseContext.tsm.tsmMetrics.RoamingCount = 0; session_entry->eseContext.tsm.tsmMetrics.RoamingCount = 0;
@@ -1045,7 +1045,7 @@ assocReject:
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
session_entry->limMlmState, session_entry->limMlmState,
session_entry->peSessionId, session_entry->peSessionId,
assoc_cnf.resultCode, MAC_ADDR_ARRAY(hdr->sa)); assoc_cnf.resultCode, QDF_MAC_ADDR_ARRAY(hdr->sa));
session_entry->limMlmState = eLIM_MLM_IDLE_STATE; session_entry->limMlmState = eLIM_MLM_IDLE_STATE;
MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE, MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE,
session_entry->peSessionId, session_entry->peSessionId,

View File

@@ -115,7 +115,7 @@ static void lim_process_auth_shared_system_algo(struct mac_context *mac_ctx,
pe_err("rx Auth frame for unsupported auth algorithm %d " pe_err("rx Auth frame for unsupported auth algorithm %d "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
rx_auth_frm_body->authAlgoNumber, rx_auth_frm_body->authAlgoNumber,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* /*
* Authenticator does not have WEP * Authenticator does not have WEP
@@ -405,7 +405,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
QDF_MAC_ADDR_SIZE))) { QDF_MAC_ADDR_SIZE))) {
pe_debug("TODO:Ack for disassoc frame is pending Issue delsta for " pe_debug("TODO:Ack for disassoc frame is pending Issue delsta for "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
pMlmDisassocReq->peer_macaddr.bytes)); pMlmDisassocReq->peer_macaddr.bytes));
lim_process_disassoc_ack_timeout(mac_ctx); lim_process_disassoc_ack_timeout(mac_ctx);
is_connected = false; is_connected = false;
@@ -418,7 +418,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
QDF_MAC_ADDR_SIZE))) { QDF_MAC_ADDR_SIZE))) {
pe_debug("TODO:Ack for deauth frame is pending Issue delsta for " pe_debug("TODO:Ack for deauth frame is pending Issue delsta for "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
pMlmDeauthReq->peer_macaddr.bytes)); pMlmDeauthReq->peer_macaddr.bytes));
lim_process_deauth_ack_timeout(mac_ctx); lim_process_deauth_ack_timeout(mac_ctx);
is_connected = false; is_connected = false;
@@ -572,7 +572,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
pe_err("rx Auth frm for unsupported auth algo %d " pe_err("rx Auth frm for unsupported auth algo %d "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
rx_auth_frm_body->authAlgoNumber, rx_auth_frm_body->authAlgoNumber,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* /*
* Responding party does not support the * Responding party does not support the
@@ -596,7 +596,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
pe_err("received Authentication frame for unsupported auth algorithm %d " pe_err("received Authentication frame for unsupported auth algorithm %d "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
rx_auth_frm_body->authAlgoNumber, rx_auth_frm_body->authAlgoNumber,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* /*
* Responding party does not support the * Responding party does not support the
@@ -683,7 +683,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
*/ */
pe_warn("received Auth frame2 from unexpected peer" pe_warn("received Auth frame2 from unexpected peer"
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(mac_hdr->sa)); MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return; return;
} }
@@ -724,7 +724,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
pe_warn("rx Auth frame2 for unexpected auth algo %d" pe_warn("rx Auth frame2 for unexpected auth algo %d"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
rx_auth_frm_body->authAlgoNumber, rx_auth_frm_body->authAlgoNumber,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return; return;
} }
} }
@@ -737,7 +737,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
pe_err("rx Auth frame from peer with failure code %d " pe_err("rx Auth frame from peer with failure code %d "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
rx_auth_frm_body->authStatusCode, rx_auth_frm_body->authStatusCode,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
lim_restore_from_auth_state(mac_ctx, eSIR_SME_AUTH_REFUSED, lim_restore_from_auth_state(mac_ctx, eSIR_SME_AUTH_REFUSED,
rx_auth_frm_body->authStatusCode, rx_auth_frm_body->authStatusCode,
pe_session); pe_session);
@@ -793,7 +793,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx,
pe_err("rx Auth frm from peer for unsupported auth algo %d " pe_err("rx Auth frm from peer for unsupported auth algo %d "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
rx_auth_frm_body->authAlgoNumber, rx_auth_frm_body->authAlgoNumber,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
auth_frame->authAlgoNumber = auth_frame->authAlgoNumber =
rx_auth_frm_body->authAlgoNumber; rx_auth_frm_body->authAlgoNumber;
@@ -897,7 +897,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
pe_err("rx Auth frame3 from peer with auth algo number %d " pe_err("rx Auth frame3 from peer with auth algo number %d "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
rx_auth_frm_body->authAlgoNumber, rx_auth_frm_body->authAlgoNumber,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* /*
* Received Authentication frame3 with algorithm other than * Received Authentication frame3 with algorithm other than
* Shared Key authentication type. Reject with Auth frame4 * Shared Key authentication type. Reject with Auth frame4
@@ -923,7 +923,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
if (!mac_hdr->fc.wep) { if (!mac_hdr->fc.wep) {
pe_err("received Auth frame3 from peer with no WEP bit set " pe_err("received Auth frame3 from peer with no WEP bit set "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* WEP bit is not set in FC of Auth Frame3 */ /* WEP bit is not set in FC of Auth Frame3 */
auth_frame->authAlgoNumber = eSIR_SHARED_KEY; auth_frame->authAlgoNumber = eSIR_SHARED_KEY;
auth_frame->authTransactionSeqNumber = auth_frame->authTransactionSeqNumber =
@@ -941,7 +941,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
if (!auth_node) { if (!auth_node) {
pe_warn("received AuthFrame3 from peer that has no preauth context " pe_warn("received AuthFrame3 from peer that has no preauth context "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* /*
* No 'pre-auth' context exists for this STA that sent * No 'pre-auth' context exists for this STA that sent
* an Authentication frame3. Send Auth frame4 with * an Authentication frame3. Send Auth frame4 with
@@ -961,7 +961,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
if (auth_node->mlmState == eLIM_MLM_AUTH_RSP_TIMEOUT_STATE) { if (auth_node->mlmState == eLIM_MLM_AUTH_RSP_TIMEOUT_STATE) {
pe_warn("auth response timer timedout for peer " pe_warn("auth response timer timedout for peer "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* /*
* Received Auth Frame3 after Auth Response timeout. * Received Auth Frame3 after Auth Response timeout.
* Reject by sending Auth Frame4 with * Reject by sending Auth Frame4 with
@@ -990,7 +990,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
pe_err("rx Auth frm3 from peer with status code %d " pe_err("rx Auth frm3 from peer with status code %d "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
rx_auth_frm_body->authStatusCode, rx_auth_frm_body->authStatusCode,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return; return;
} }
/* /*
@@ -1024,7 +1024,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx,
return; return;
} else { } else {
pe_warn("Challenge failure for peer "MAC_ADDRESS_STR, pe_warn("Challenge failure for peer "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* /*
* Challenge Failure. * Challenge Failure.
* Send Authentication frame4 with 'challenge failure' * Send Authentication frame4 with 'challenge failure'
@@ -1060,7 +1060,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx,
pe_warn("received unexpected Auth frame4 from peer in state %d, addr " pe_warn("received unexpected Auth frame4 from peer in state %d, addr "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
pe_session->limMlmState, pe_session->limMlmState,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return; return;
} }
@@ -1074,7 +1074,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx,
pe_err("received Auth frame4 from peer with invalid auth algo %d" pe_err("received Auth frame4 from peer with invalid auth algo %d"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
rx_auth_frm_body->authAlgoNumber, rx_auth_frm_body->authAlgoNumber,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return; return;
} }
@@ -1088,7 +1088,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx,
*/ */
pe_warn("received Auth frame4 from unexpected peer "MAC_ADDRESS_STR, pe_warn("received Auth frame4 from unexpected peer "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return; return;
} }
@@ -1103,7 +1103,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx,
pe_err("received Authentication frame from peer with invalid auth seq number %d " pe_err("received Authentication frame from peer with invalid auth seq number %d "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
rx_auth_frm_body->authTransactionSeqNumber, rx_auth_frm_body->authTransactionSeqNumber,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return; return;
} }
@@ -1138,7 +1138,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx,
* Return Auth confirm with received failure code to SME * Return Auth confirm with received failure code to SME
*/ */
pe_err("Authentication failure from peer "MAC_ADDRESS_STR, pe_err("Authentication failure from peer "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
lim_restore_from_auth_state(mac_ctx, eSIR_SME_AUTH_REFUSED, lim_restore_from_auth_state(mac_ctx, eSIR_SME_AUTH_REFUSED,
rx_auth_frm_body->authStatusCode, rx_auth_frm_body->authStatusCode,
pe_session); pe_session);
@@ -1220,7 +1220,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
pe_debug("Sessionid: %d System role: %d limMlmState: %d: Auth response Received BSSID: "MAC_ADDRESS_STR" RSSI: %d", pe_debug("Sessionid: %d System role: %d limMlmState: %d: Auth response Received BSSID: "MAC_ADDRESS_STR" RSSI: %d",
pe_session->peSessionId, GET_LIM_SYSTEM_ROLE(pe_session), pe_session->peSessionId, GET_LIM_SYSTEM_ROLE(pe_session),
pe_session->limMlmState, MAC_ADDR_ARRAY(mac_hdr->bssId), pe_session->limMlmState, QDF_MAC_ADDR_ARRAY(mac_hdr->bssId),
(uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info))); (uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info)));
if (pe_session->prev_auth_seq_num == curr_seq_num && if (pe_session->prev_auth_seq_num == curr_seq_num &&
@@ -1341,7 +1341,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
if (!cfg_privacy_opt_imp) { if (!cfg_privacy_opt_imp) {
pe_err("received Authentication frame3 from peer that while privacy option is turned OFF " pe_err("received Authentication frame3 from peer that while privacy option is turned OFF "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* /*
* Privacy option is not implemented. * Privacy option is not implemented.
* So reject Authentication frame received with * So reject Authentication frame received with
@@ -1370,7 +1370,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
if (!auth_node) { if (!auth_node) {
pe_err("rx Auth frame with no preauth ctx with WEP bit set " pe_err("rx Auth frame with no preauth ctx with WEP bit set "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* /*
* No 'pre-auth' context exists for this STA * No 'pre-auth' context exists for this STA
* that sent an Authentication frame with FC * that sent an Authentication frame with FC
@@ -1398,7 +1398,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
pe_err("received Authentication frame from peer that is in state %d " pe_err("received Authentication frame from peer that is in state %d "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
auth_node->mlmState, auth_node->mlmState,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* /*
* Should not have received Authentication frame * Should not have received Authentication frame
* with WEP bit set in FC in other states. * with WEP bit set in FC in other states.
@@ -1458,7 +1458,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
if (decrypt_result == LIM_DECRYPT_ICV_FAIL) { if (decrypt_result == LIM_DECRYPT_ICV_FAIL) {
pe_err("received Authentication frame from peer that failed decryption: " pe_err("received Authentication frame from peer that failed decryption: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
/* ICV failure */ /* ICV failure */
lim_delete_pre_auth_node(mac_ctx, mac_hdr->sa); lim_delete_pre_auth_node(mac_ctx, mac_hdr->sa);
auth_frame->authAlgoNumber = eSIR_SHARED_KEY; auth_frame->authAlgoNumber = eSIR_SHARED_KEY;
@@ -1592,7 +1592,7 @@ QDF_STATUS lim_process_auth_frame_no_session(struct mac_context *mac, uint8_t *p
frameLen = WMA_GET_RX_PAYLOAD_LEN(pBd); frameLen = WMA_GET_RX_PAYLOAD_LEN(pBd);
pe_debug("Auth Frame Received: BSSID " MAC_ADDRESS_STR " (RSSI %d)", pe_debug("Auth Frame Received: BSSID " MAC_ADDRESS_STR " (RSSI %d)",
MAC_ADDR_ARRAY(pHdr->bssId), QDF_MAC_ADDR_ARRAY(pHdr->bssId),
(uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(pBd))); (uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(pBd)));
/* Auth frame has come on a new BSS, however, we need to find the session /* Auth frame has come on a new BSS, however, we need to find the session

View File

@@ -150,12 +150,12 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
pe_debug("Received Deauth frame for Addr: " MAC_ADDRESS_STR pe_debug("Received Deauth frame for Addr: " MAC_ADDRESS_STR
"(mlm state = %s, sme state = %d systemrole = %d " "(mlm state = %s, sme state = %d systemrole = %d "
"RSSI = %d) with reason code %d [%s] from " "RSSI = %d) with reason code %d [%s] from "
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pHdr->da), MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pHdr->da),
lim_mlm_state_str(pe_session->limMlmState), lim_mlm_state_str(pe_session->limMlmState),
pe_session->limSmeState, pe_session->limSmeState,
GET_LIM_SYSTEM_ROLE(pe_session), frame_rssi, GET_LIM_SYSTEM_ROLE(pe_session), frame_rssi,
reasonCode, lim_dot11_reason_str(reasonCode), reasonCode, lim_dot11_reason_str(reasonCode),
MAC_ADDR_ARRAY(pHdr->sa)); QDF_MAC_ADDR_ARRAY(pHdr->sa));
if (mac->mlme_cfg->gen.fatal_event_trigger && if (mac->mlme_cfg->gen.fatal_event_trigger &&
(reasonCode != eSIR_MAC_UNSPEC_FAILURE_REASON && (reasonCode != eSIR_MAC_UNSPEC_FAILURE_REASON &&
@@ -189,7 +189,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
/* Log error and ignore the frame */ /* Log error and ignore the frame */
pe_err("received Deauth frame with invalid reasonCode %d from " pe_err("received Deauth frame with invalid reasonCode %d from "
MAC_ADDRESS_STR, reasonCode, MAC_ADDRESS_STR, reasonCode,
MAC_ADDR_ARRAY(pHdr->sa)); QDF_MAC_ADDR_ARRAY(pHdr->sa));
break; break;
} }
@@ -209,7 +209,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
/* Log error and ignore the frame */ /* Log error and ignore the frame */
pe_err("received Deauth frame with invalid reasonCode %d from " pe_err("received Deauth frame with invalid reasonCode %d from "
MAC_ADDRESS_STR, reasonCode, MAC_ADDRESS_STR, reasonCode,
MAC_ADDR_ARRAY(pHdr->sa)); QDF_MAC_ADDR_ARRAY(pHdr->sa));
break; break;
} }
@@ -219,7 +219,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
pe_err("received Deauth frame with reasonCode %d in role %d from " pe_err("received Deauth frame with reasonCode %d in role %d from "
MAC_ADDRESS_STR, reasonCode, MAC_ADDRESS_STR, reasonCode,
GET_LIM_SYSTEM_ROLE(pe_session), GET_LIM_SYSTEM_ROLE(pe_session),
MAC_ADDR_ARRAY(pHdr->sa)); QDF_MAC_ADDR_ARRAY(pHdr->sa));
return; return;
} }
@@ -274,8 +274,8 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
pe_debug("Rcv Deauth from unknown/different " pe_debug("Rcv Deauth from unknown/different "
"AP while ReAssoc. Ignore " MAC_ADDRESS_STR "AP while ReAssoc. Ignore " MAC_ADDRESS_STR
"limReAssocbssId : " MAC_ADDRESS_STR, "limReAssocbssId : " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pHdr->sa), QDF_MAC_ADDR_ARRAY(pHdr->sa),
MAC_ADDR_ARRAY(pe_session->limReAssocbssId)); QDF_MAC_ADDR_ARRAY(pe_session->limReAssocbssId));
return; return;
} }
@@ -286,8 +286,8 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
pe_debug("received DeAuth from the New AP to " pe_debug("received DeAuth from the New AP to "
"which ReAssoc is sent " MAC_ADDRESS_STR "which ReAssoc is sent " MAC_ADDRESS_STR
"pe_session->bssId: " MAC_ADDRESS_STR, "pe_session->bssId: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pHdr->sa), QDF_MAC_ADDR_ARRAY(pHdr->sa),
MAC_ADDR_ARRAY(pe_session->bssId)); QDF_MAC_ADDR_ARRAY(pe_session->bssId));
lim_restore_pre_reassoc_state(mac, lim_restore_pre_reassoc_state(mac,
eSIR_SME_REASSOC_REFUSED, eSIR_SME_REASSOC_REFUSED,
@@ -304,7 +304,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
if (!IS_CURRENT_BSSID(mac, pHdr->bssId, pe_session)) { if (!IS_CURRENT_BSSID(mac, pHdr->bssId, pe_session)) {
pe_err("received DeAuth from an AP other " pe_err("received DeAuth from an AP other "
"than we're trying to join. Ignore. " "than we're trying to join. Ignore. "
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pHdr->sa)); MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pHdr->sa));
if (lim_search_pre_auth_list(mac, pHdr->sa)) { if (lim_search_pre_auth_list(mac, pHdr->sa)) {
pe_debug("Preauth entry exist. Deleting"); pe_debug("Preauth entry exist. Deleting");
@@ -348,7 +348,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
pe_debug("received Deauth frame state %X with failure " pe_debug("received Deauth frame state %X with failure "
"code %d from " MAC_ADDRESS_STR, "code %d from " MAC_ADDRESS_STR,
pe_session->limMlmState, rc, pe_session->limMlmState, rc,
MAC_ADDR_ARRAY(addr)); QDF_MAC_ADDR_ARRAY(addr));
lim_restore_from_auth_state(mac_ctx, lim_restore_from_auth_state(mac_ctx,
eSIR_SME_DEAUTH_WHILE_JOIN, eSIR_SME_DEAUTH_WHILE_JOIN,
@@ -360,7 +360,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
pe_debug("received Deauth frame state %X with " pe_debug("received Deauth frame state %X with "
"reasonCode=%d from " MAC_ADDRESS_STR, "reasonCode=%d from " MAC_ADDRESS_STR,
pe_session->limMlmState, rc, pe_session->limMlmState, rc,
MAC_ADDR_ARRAY(addr)); QDF_MAC_ADDR_ARRAY(addr));
/* / Issue Deauth Indication to SME. */ /* / Issue Deauth Indication to SME. */
qdf_mem_copy((uint8_t *) &mlmDeauthInd.peerMacAddr, qdf_mem_copy((uint8_t *) &mlmDeauthInd.peerMacAddr,
addr, sizeof(tSirMacAddr)); addr, sizeof(tSirMacAddr));
@@ -386,7 +386,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
pe_debug("received Deauth frame state %X with " pe_debug("received Deauth frame state %X with "
"reasonCode=%d from " MAC_ADDRESS_STR, "reasonCode=%d from " MAC_ADDRESS_STR,
pe_session->limMlmState, rc, pe_session->limMlmState, rc,
MAC_ADDR_ARRAY(addr)); QDF_MAC_ADDR_ARRAY(addr));
if (lim_search_pre_auth_list(mac_ctx, addr)) if (lim_search_pre_auth_list(mac_ctx, addr))
lim_delete_pre_auth_node(mac_ctx, addr); lim_delete_pre_auth_node(mac_ctx, addr);
@@ -423,7 +423,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
pe_debug("Received Deauth frame in state %X with Reason " pe_debug("Received Deauth frame in state %X with Reason "
"Code %d from Peer" MAC_ADDRESS_STR, "Code %d from Peer" MAC_ADDRESS_STR,
pe_session->limMlmState, rc, pe_session->limMlmState, rc,
MAC_ADDR_ARRAY(addr)); QDF_MAC_ADDR_ARRAY(addr));
return; return;
case eLIM_MLM_IDLE_STATE: case eLIM_MLM_IDLE_STATE:
@@ -435,7 +435,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
"reason code %d from Tdls peer" "reason code %d from Tdls peer"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
pe_session->limMlmState, rc, pe_session->limMlmState, rc,
MAC_ADDR_ARRAY(addr)); QDF_MAC_ADDR_ARRAY(addr));
lim_send_sme_tdls_del_sta_ind(mac_ctx, sta_ds, lim_send_sme_tdls_del_sta_ind(mac_ctx, sta_ds,
pe_session, pe_session,
rc); rc);
@@ -465,21 +465,21 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi
pe_err("received Deauth frame state %X with " pe_err("received Deauth frame state %X with "
"reasonCode=%d from " MAC_ADDRESS_STR, "reasonCode=%d from " MAC_ADDRESS_STR,
pe_session->limMlmState, rc, pe_session->limMlmState, rc,
MAC_ADDR_ARRAY(addr)); QDF_MAC_ADDR_ARRAY(addr));
break; break;
case eLIM_MLM_WT_FT_REASSOC_RSP_STATE: case eLIM_MLM_WT_FT_REASSOC_RSP_STATE:
pe_err("received Deauth frame in FT state %X with " pe_err("received Deauth frame in FT state %X with "
"reasonCode=%d from " MAC_ADDRESS_STR, "reasonCode=%d from " MAC_ADDRESS_STR,
pe_session->limMlmState, rc, pe_session->limMlmState, rc,
MAC_ADDR_ARRAY(addr)); QDF_MAC_ADDR_ARRAY(addr));
break; break;
default: default:
pe_err("received Deauth frame in state %X with " pe_err("received Deauth frame in state %X with "
"reasonCode=%d from " MAC_ADDRESS_STR, "reasonCode=%d from " MAC_ADDRESS_STR,
pe_session->limMlmState, rc, pe_session->limMlmState, rc,
MAC_ADDR_ARRAY(addr)); QDF_MAC_ADDR_ARRAY(addr));
return; return;
} }
break; break;

View File

@@ -149,10 +149,10 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
pe_debug("Received Disassoc frame for Addr: " MAC_ADDRESS_STR pe_debug("Received Disassoc frame for Addr: " MAC_ADDRESS_STR
"(mlm state=%s, sme state=%d RSSI=%d)," "(mlm state=%s, sme state=%d RSSI=%d),"
"with reason code %d [%s] from " MAC_ADDRESS_STR, "with reason code %d [%s] from " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pHdr->da), QDF_MAC_ADDR_ARRAY(pHdr->da),
lim_mlm_state_str(pe_session->limMlmState), lim_mlm_state_str(pe_session->limMlmState),
pe_session->limSmeState, frame_rssi, reasonCode, pe_session->limSmeState, frame_rssi, reasonCode,
lim_dot11_reason_str(reasonCode), MAC_ADDR_ARRAY(pHdr->sa)); lim_dot11_reason_str(reasonCode), QDF_MAC_ADDR_ARRAY(pHdr->sa));
lim_diag_event_report(mac, WLAN_PE_DIAG_DISASSOC_FRAME_EVENT, lim_diag_event_report(mac, WLAN_PE_DIAG_DISASSOC_FRAME_EVENT,
pe_session, 0, reasonCode); pe_session, 0, reasonCode);
@@ -180,7 +180,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
*/ */
pe_err("received Disassoc frame from STA that does not have context" pe_err("received Disassoc frame from STA that does not have context"
"reasonCode=%d, addr " MAC_ADDRESS_STR, "reasonCode=%d, addr " MAC_ADDRESS_STR,
reasonCode, MAC_ADDR_ARRAY(pHdr->sa)); reasonCode, QDF_MAC_ADDR_ARRAY(pHdr->sa));
return; return;
} }
@@ -246,7 +246,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
default: default:
/* Invalid reasonCode in received Disassociation frame */ /* Invalid reasonCode in received Disassociation frame */
pe_warn("received Disassoc frame with invalid reasonCode: %d from " MAC_ADDRESS_STR, pe_warn("received Disassoc frame with invalid reasonCode: %d from " MAC_ADDRESS_STR,
reasonCode, MAC_ADDR_ARRAY(pHdr->sa)); reasonCode, QDF_MAC_ADDR_ARRAY(pHdr->sa));
break; break;
} }
} else if (LIM_IS_STA_ROLE(pe_session) && } else if (LIM_IS_STA_ROLE(pe_session) &&
@@ -262,7 +262,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
if (pe_session->gLimChannelSwitch.state != if (pe_session->gLimChannelSwitch.state !=
eLIM_CHANNEL_SWITCH_IDLE) { eLIM_CHANNEL_SWITCH_IDLE) {
pe_err("Ignoring disassoc frame due to upcoming channel switch, from "MAC_ADDRESS_STR, pe_err("Ignoring disassoc frame due to upcoming channel switch, from "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pHdr->sa)); QDF_MAC_ADDR_ARRAY(pHdr->sa));
return; return;
} }
break; break;
@@ -276,7 +276,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
pe_err("received Disassoc frame with invalid reasonCode: %d in role:" pe_err("received Disassoc frame with invalid reasonCode: %d in role:"
"%d in sme state: %d from " MAC_ADDRESS_STR, reasonCode, "%d in sme state: %d from " MAC_ADDRESS_STR, reasonCode,
GET_LIM_SYSTEM_ROLE(pe_session), pe_session->limSmeState, GET_LIM_SYSTEM_ROLE(pe_session), pe_session->limSmeState,
MAC_ADDR_ARRAY(pHdr->sa)); QDF_MAC_ADDR_ARRAY(pHdr->sa));
return; return;
} }
@@ -306,7 +306,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
pe_err("received Disassoc frame from peer that is in state: %X, addr "MAC_ADDRESS_STR, pe_err("received Disassoc frame from peer that is in state: %X, addr "MAC_ADDRESS_STR,
sta->mlmStaContext.mlmState, sta->mlmStaContext.mlmState,
MAC_ADDR_ARRAY(pHdr->sa)); QDF_MAC_ADDR_ARRAY(pHdr->sa));
} /* if (sta->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE) */ } /* if (sta->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE) */

View File

@@ -1756,7 +1756,7 @@ static void lim_process_messages(struct mac_context *mac_ctx,
pe_debug("bssId" pe_debug("bssId"
MAC_ADDRESS_STR MAC_ADDRESS_STR
" ctWin=%d oppPsFlag=%d", " ctWin=%d oppPsFlag=%d",
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
session_entry->bssId), session_entry->bssId),
session_entry->p2pGoPsUpdate.ctWin, session_entry->p2pGoPsUpdate.ctWin,
session_entry->p2pGoPsUpdate.oppPsFlag); session_entry->p2pGoPsUpdate.oppPsFlag);

View File

@@ -74,7 +74,8 @@ void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx,
pe_debug("ReAssoc Req on session: %d role: %d mlm: %d " MAC_ADDRESS_STR, pe_debug("ReAssoc Req on session: %d role: %d mlm: %d " MAC_ADDRESS_STR,
reassoc_req->sessionId, GET_LIM_SYSTEM_ROLE(session), reassoc_req->sessionId, GET_LIM_SYSTEM_ROLE(session),
session->limMlmState, MAC_ADDR_ARRAY(reassoc_req->peerMacAddr)); session->limMlmState,
QDF_MAC_ADDR_ARRAY(reassoc_req->peerMacAddr));
if (LIM_IS_AP_ROLE(session) || if (LIM_IS_AP_ROLE(session) ||
(session->limMlmState != (session->limMlmState !=
@@ -87,7 +88,7 @@ void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx,
pe_warn("unexpect msg state: %X role: %d MAC" MAC_ADDRESS_STR, pe_warn("unexpect msg state: %X role: %d MAC" MAC_ADDRESS_STR,
session->limMlmState, GET_LIM_SYSTEM_ROLE(session), session->limMlmState, GET_LIM_SYSTEM_ROLE(session),
MAC_ADDR_ARRAY(reassoc_req->peerMacAddr)); QDF_MAC_ADDR_ARRAY(reassoc_req->peerMacAddr));
lim_print_mlm_state(mac_ctx, LOGW, session->limMlmState); lim_print_mlm_state(mac_ctx, LOGW, session->limMlmState);
reassoc_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS; reassoc_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS;
reassoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; reassoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;

View File

@@ -895,7 +895,7 @@ static QDF_STATUS lim_process_mlm_auth_req_sae(struct mac_context *mac_ctx,
sae_info->vdev_id, sae_info->vdev_id,
sae_info->ssid.length, sae_info->ssid.length,
sae_info->ssid.ssId, sae_info->ssid.ssId,
MAC_ADDR_ARRAY(sae_info->peer_mac_addr.bytes)); QDF_MAC_ADDR_ARRAY(sae_info->peer_mac_addr.bytes));
msg.type = eWNI_SME_TRIGGER_SAE; msg.type = eWNI_SME_TRIGGER_SAE;
msg.bodyptr = sae_info; msg.bodyptr = sae_info;
@@ -973,7 +973,7 @@ static void lim_process_mlm_auth_req(struct mac_context *mac_ctx, uint32_t *msg)
"mlmstate %d from: " MAC_ADDRESS_STR "mlmstate %d from: " MAC_ADDRESS_STR
" with authtype %d", session_id, " with authtype %d", session_id,
GET_LIM_SYSTEM_ROLE(session), session->limMlmState, GET_LIM_SYSTEM_ROLE(session), session->limMlmState,
MAC_ADDR_ARRAY(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr), QDF_MAC_ADDR_ARRAY(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr),
mac_ctx->lim.gpLimMlmAuthReq->authType); mac_ctx->lim.gpLimMlmAuthReq->authType);
sir_copy_mac_addr(curr_bssid, session->bssId); sir_copy_mac_addr(curr_bssid, session->bssId);
@@ -997,7 +997,7 @@ static void lim_process_mlm_auth_req(struct mac_context *mac_ctx, uint32_t *msg)
if (lim_is_preauth_ctx_exists(mac_ctx, session, &preauth_node)) { if (lim_is_preauth_ctx_exists(mac_ctx, session, &preauth_node)) {
pe_debug("Already have pre-auth context with peer: " pe_debug("Already have pre-auth context with peer: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr)); QDF_MAC_ADDR_ARRAY(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr));
mlm_auth_cnf.resultCode = (tSirResultCodes) mlm_auth_cnf.resultCode = (tSirResultCodes)
eSIR_MAC_SUCCESS_STATUS; eSIR_MAC_SUCCESS_STATUS;
goto end; goto end;
@@ -1156,7 +1156,7 @@ static void lim_process_mlm_assoc_req(struct mac_context *mac_ctx, uint32_t *msg
pe_warn("received unexpected MLM_ASSOC_CNF in state %X for role=%d, MAC addr= " pe_warn("received unexpected MLM_ASSOC_CNF in state %X for role=%d, MAC addr= "
MAC_ADDRESS_STR, session_entry->limMlmState, MAC_ADDRESS_STR, session_entry->limMlmState,
GET_LIM_SYSTEM_ROLE(session_entry), GET_LIM_SYSTEM_ROLE(session_entry),
MAC_ADDR_ARRAY(mlm_assoc_req->peerMacAddr)); QDF_MAC_ADDR_ARRAY(mlm_assoc_req->peerMacAddr));
lim_print_mlm_state(mac_ctx, LOGW, session_entry->limMlmState); lim_print_mlm_state(mac_ctx, LOGW, session_entry->limMlmState);
mlm_assoc_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS; mlm_assoc_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS;
mlm_assoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; mlm_assoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
@@ -1255,7 +1255,7 @@ lim_process_mlm_disassoc_req_ntf(struct mac_context *mac_ctx,
"mlmstate %d from: " MAC_ADDRESS_STR, "mlmstate %d from: " MAC_ADDRESS_STR,
mlm_disassocreq->sessionId, GET_LIM_SYSTEM_ROLE(session), mlm_disassocreq->sessionId, GET_LIM_SYSTEM_ROLE(session),
session->limMlmState, session->limMlmState,
MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes)); QDF_MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes));
qdf_mem_copy(curr_bssid.bytes, session->bssId, QDF_MAC_ADDR_SIZE); qdf_mem_copy(curr_bssid.bytes, session->bssId, QDF_MAC_ADDR_SIZE);
@@ -1280,7 +1280,7 @@ lim_process_mlm_disassoc_req_ntf(struct mac_context *mac_ctx,
pe_debug("send disassoc rsp with ret code %d for" MAC_ADDRESS_STR, pe_debug("send disassoc rsp with ret code %d for" MAC_ADDRESS_STR,
eSIR_SME_DEAUTH_STATUS, eSIR_SME_DEAUTH_STATUS,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
mlm_disassocreq->peer_macaddr.bytes)); mlm_disassocreq->peer_macaddr.bytes));
sme_disassoc_rsp->messageType = eWNI_SME_DISASSOC_RSP; sme_disassoc_rsp->messageType = eWNI_SME_DISASSOC_RSP;
@@ -1335,7 +1335,7 @@ lim_process_mlm_disassoc_req_ntf(struct mac_context *mac_ctx,
* have context or in some transit state. * have context or in some transit state.
*/ */
pe_warn("Invalid MLM_DISASSOC_REQ, Addr= " MAC_ADDRESS_STR, pe_warn("Invalid MLM_DISASSOC_REQ, Addr= " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes)); QDF_MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes));
if (stads) if (stads)
pe_err("Sta MlmState: %d", stads->mlmStaContext.mlmState); pe_err("Sta MlmState: %d", stads->mlmStaContext.mlmState);
@@ -1543,7 +1543,7 @@ lim_process_mlm_disassoc_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
mlm_disassoc_req = (tLimMlmDisassocReq *) msg_buf; mlm_disassoc_req = (tLimMlmDisassocReq *) msg_buf;
pe_debug("Process disassoc req, sessionID %d from: "MAC_ADDRESS_STR, pe_debug("Process disassoc req, sessionID %d from: "MAC_ADDRESS_STR,
mlm_disassoc_req->sessionId, mlm_disassoc_req->sessionId,
MAC_ADDR_ARRAY(mlm_disassoc_req->peer_macaddr.bytes)); QDF_MAC_ADDR_ARRAY(mlm_disassoc_req->peer_macaddr.bytes));
lim_process_mlm_disassoc_req_ntf(mac_ctx, QDF_STATUS_SUCCESS, lim_process_mlm_disassoc_req_ntf(mac_ctx, QDF_STATUS_SUCCESS,
(uint32_t *) msg_buf); (uint32_t *) msg_buf);
@@ -1592,7 +1592,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
mlm_deauth_req->sessionId, mlm_deauth_req->sessionId,
GET_LIM_SYSTEM_ROLE(session), GET_LIM_SYSTEM_ROLE(session),
session->limMlmState, session->limMlmState,
MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes)); QDF_MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes));
sir_copy_mac_addr(curr_bssId, session->bssId); sir_copy_mac_addr(curr_bssId, session->bssId);
switch (GET_LIM_SYSTEM_ROLE(session)) { switch (GET_LIM_SYSTEM_ROLE(session)) {
@@ -1613,9 +1613,9 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
pe_err("received MLM_DEAUTH_REQ with invalid BSS id " pe_err("received MLM_DEAUTH_REQ with invalid BSS id "
"Peer MAC: "MAC_ADDRESS_STR "Peer MAC: "MAC_ADDRESS_STR
" CFG BSSID Addr : "MAC_ADDRESS_STR, " CFG BSSID Addr : "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
mlm_deauth_req->peer_macaddr.bytes), mlm_deauth_req->peer_macaddr.bytes),
MAC_ADDR_ARRAY(curr_bssId)); QDF_MAC_ADDR_ARRAY(curr_bssId));
/* /*
* Deauthentication response to host triggered * Deauthentication response to host triggered
* deauthentication * deauthentication
@@ -1629,7 +1629,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
pe_debug("send deauth rsp with ret code %d for" MAC_ADDRESS_STR, pe_debug("send deauth rsp with ret code %d for" MAC_ADDRESS_STR,
eSIR_SME_DEAUTH_STATUS, eSIR_SME_DEAUTH_STATUS,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
mlm_deauth_req->peer_macaddr.bytes)); mlm_deauth_req->peer_macaddr.bytes));
sme_deauth_rsp->messageType = sme_deauth_rsp->messageType =
@@ -1675,7 +1675,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
pe_warn("received MLM_DEAUTH_REQ with in state %d for peer " pe_warn("received MLM_DEAUTH_REQ with in state %d for peer "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
session->limMlmState, session->limMlmState,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
mlm_deauth_req->peer_macaddr.bytes)); mlm_deauth_req->peer_macaddr.bytes));
lim_print_mlm_state(mac_ctx, LOGW, lim_print_mlm_state(mac_ctx, LOGW,
session->limMlmState); session->limMlmState);
@@ -1726,7 +1726,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
"does not have context, Addr=" "does not have context, Addr="
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
session->limMlmState, session->limMlmState,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
mlm_deauth_req->peer_macaddr.bytes)); mlm_deauth_req->peer_macaddr.bytes));
mlm_deauth_cnf.resultCode = mlm_deauth_cnf.resultCode =
eSIR_SME_STA_NOT_AUTHENTICATED; eSIR_SME_STA_NOT_AUTHENTICATED;
@@ -1751,7 +1751,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
* in some transit state * in some transit state
*/ */
pe_warn("Invalid MLM_DEAUTH_REQ, Addr="MAC_ADDRESS_STR, pe_warn("Invalid MLM_DEAUTH_REQ, Addr="MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes)); QDF_MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes));
/* Prepare and Send LIM_MLM_DEAUTH_CNF */ /* Prepare and Send LIM_MLM_DEAUTH_CNF */
mlm_deauth_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS; mlm_deauth_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS;
goto end; goto end;
@@ -1835,7 +1835,7 @@ void lim_process_mlm_deauth_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
pe_debug("Process Deauth Req on sessionID %d from: " pe_debug("Process Deauth Req on sessionID %d from: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
mlm_deauth_req->sessionId, mlm_deauth_req->sessionId,
MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes)); QDF_MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes));
session = pe_find_session_by_session_id(mac_ctx, session = pe_find_session_by_session_id(mac_ctx,
mlm_deauth_req->sessionId); mlm_deauth_req->sessionId);
@@ -1918,7 +1918,7 @@ lim_process_mlm_set_keys_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
&curr_bssid))) { &curr_bssid))) {
pe_debug("Received MLM_SETKEYS_REQ with invalid BSSID" pe_debug("Received MLM_SETKEYS_REQ with invalid BSSID"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mlm_set_keys_req-> QDF_MAC_ADDR_ARRAY(mlm_set_keys_req->
peer_macaddr.bytes)); peer_macaddr.bytes));
/* /*
* Prepare and Send LIM_MLM_SETKEYS_CNF with error code * Prepare and Send LIM_MLM_SETKEYS_CNF with error code
@@ -1986,7 +1986,7 @@ lim_process_mlm_set_keys_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
*/ */
pe_debug("Invalid MLM_SETKEYS_REQ, Addr = " pe_debug("Invalid MLM_SETKEYS_REQ, Addr = "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mlm_set_keys_req-> QDF_MAC_ADDR_ARRAY(mlm_set_keys_req->
peer_macaddr.bytes)); peer_macaddr.bytes));
/* Prepare and Send LIM_MLM_SETKEYS_CNF */ /* Prepare and Send LIM_MLM_SETKEYS_CNF */
mlm_set_keys_cnf.resultCode = mlm_set_keys_cnf.resultCode =
@@ -2080,7 +2080,8 @@ void lim_process_join_failure_timeout(struct mac_context *mac_ctx)
/* Issue MLM join confirm with timeout reason code */ /* Issue MLM join confirm with timeout reason code */
pe_err("Join Failure Timeout, In eLIM_MLM_WT_JOIN_BEACON_STATE session:%d " pe_err("Join Failure Timeout, In eLIM_MLM_WT_JOIN_BEACON_STATE session:%d "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
session->peSessionId, MAC_ADDR_ARRAY(session->bssId)); session->peSessionId,
QDF_MAC_ADDR_ARRAY(session->bssId));
mlm_join_cnf.resultCode = eSIR_SME_JOIN_TIMEOUT_RESULT_CODE; mlm_join_cnf.resultCode = eSIR_SME_JOIN_TIMEOUT_RESULT_CODE;
mlm_join_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; mlm_join_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
@@ -2319,13 +2320,13 @@ lim_process_auth_rsp_timeout(struct mac_context *mac_ctx, uint32_t auth_idx)
if (auth_node->mlmState != eLIM_MLM_WT_AUTH_FRAME3_STATE) { if (auth_node->mlmState != eLIM_MLM_WT_AUTH_FRAME3_STATE) {
pe_err("received AUTH rsp timeout in unexpected " pe_err("received AUTH rsp timeout in unexpected "
"state for MAC address: " MAC_ADDRESS_STR, "state for MAC address: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(auth_node->peerMacAddr)); QDF_MAC_ADDR_ARRAY(auth_node->peerMacAddr));
} else { } else {
auth_node->mlmState = eLIM_MLM_AUTH_RSP_TIMEOUT_STATE; auth_node->mlmState = eLIM_MLM_AUTH_RSP_TIMEOUT_STATE;
auth_node->fTimerStarted = 0; auth_node->fTimerStarted = 0;
pe_debug("AUTH rsp timedout for MAC address " pe_debug("AUTH rsp timedout for MAC address "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(auth_node->peerMacAddr)); QDF_MAC_ADDR_ARRAY(auth_node->peerMacAddr));
/* Change timer to reactivate it in future */ /* Change timer to reactivate it in future */
lim_deactivate_and_change_per_sta_id_timer(mac_ctx, lim_deactivate_and_change_per_sta_id_timer(mac_ctx,
eLIM_AUTH_RSP_TIMER, auth_node->authNodeIdx); eLIM_AUTH_RSP_TIMER, auth_node->authNodeIdx);
@@ -2384,7 +2385,7 @@ void lim_process_assoc_failure_timeout(struct mac_context *mac_ctx,
pe_debug("Sessionid: %d try sending deauth on channel %d to BSSID: " pe_debug("Sessionid: %d try sending deauth on channel %d to BSSID: "
MAC_ADDRESS_STR, session->peSessionId, MAC_ADDRESS_STR, session->peSessionId,
session->currentOperChannel, session->currentOperChannel,
MAC_ADDR_ARRAY(session->bssId)); QDF_MAC_ADDR_ARRAY(session->bssId));
lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON, lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON,
session->bssId, session, false); session->bssId, session, false);
@@ -2422,7 +2423,7 @@ void lim_process_assoc_failure_timeout(struct mac_context *mac_ctx,
/* To remove the preauth node in case of fail to associate */ /* To remove the preauth node in case of fail to associate */
if (lim_search_pre_auth_list(mac_ctx, session->bssId)) { if (lim_search_pre_auth_list(mac_ctx, session->bssId)) {
pe_debug("delete pre auth node for "MAC_ADDRESS_STR, pe_debug("delete pre auth node for "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(session->bssId)); QDF_MAC_ADDR_ARRAY(session->bssId));
lim_delete_pre_auth_node(mac_ctx, lim_delete_pre_auth_node(mac_ctx,
session->bssId); session->bssId);
} }

View File

@@ -997,7 +997,7 @@ static void lim_process_mlm_deauth_ind(struct mac_context *mac_ctx,
&session_id); &session_id);
if (!session) { if (!session) {
pe_err("session does not exist for Addr:" MAC_ADDRESS_STR, pe_err("session does not exist for Addr:" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(deauth_ind->peerMacAddr)); QDF_MAC_ADDR_ARRAY(deauth_ind->peerMacAddr));
return; return;
} }
role = GET_LIM_SYSTEM_ROLE(session); role = GET_LIM_SYSTEM_ROLE(session);
@@ -3146,7 +3146,7 @@ static void lim_process_switch_channel_join_req(
pe_err("Index %d Sessionid: %d Send deauth on " pe_err("Index %d Sessionid: %d Send deauth on "
"channel %d to BSSID: "MAC_ADDRESS_STR, apCount, "channel %d to BSSID: "MAC_ADDRESS_STR, apCount,
session_entry->peSessionId, session_entry->currentOperChannel, session_entry->peSessionId, session_entry->currentOperChannel,
MAC_ADDR_ARRAY(session_entry->pLimMlmJoinReq->bssDescription. QDF_MAC_ADDR_ARRAY(session_entry->pLimMlmJoinReq->bssDescription.
bssId)); bssId));
lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON, lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON,
@@ -3189,7 +3189,7 @@ static void lim_process_switch_channel_join_req(
pe_debug("Sessionid: %d Send Probe req on channel %d ssid:%.*s " pe_debug("Sessionid: %d Send Probe req on channel %d ssid:%.*s "
"BSSID: " MAC_ADDRESS_STR, session_entry->peSessionId, "BSSID: " MAC_ADDRESS_STR, session_entry->peSessionId,
session_entry->currentOperChannel, ssId.length, ssId.ssId, session_entry->currentOperChannel, ssId.length, ssId.ssId,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
session_entry->pLimMlmJoinReq->bssDescription.bssId)); session_entry->pLimMlmJoinReq->bssDescription.bssId));
/* /*

View File

@@ -284,7 +284,7 @@ lim_process_probe_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
frame_len, &probe_req) == QDF_STATUS_E_FAILURE) { frame_len, &probe_req) == QDF_STATUS_E_FAILURE) {
pe_err("Parse error ProbeReq, length: %d, SA is: " pe_err("Parse error ProbeReq, length: %d, SA is: "
MAC_ADDRESS_STR, frame_len, MAC_ADDRESS_STR, frame_len,
MAC_ADDR_ARRAY(mac_hdr->sa)); QDF_MAC_ADDR_ARRAY(mac_hdr->sa));
return; return;
} }
if (session->pePersona == QDF_P2P_GO_MODE) { if (session->pePersona == QDF_P2P_GO_MODE) {

View File

@@ -129,7 +129,7 @@ lim_process_probe_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_Packet_info
pe_debug("Rx Probe Response with length = %d from "MAC_ADDRESS_STR, pe_debug("Rx Probe Response with length = %d from "MAC_ADDRESS_STR,
WMA_GET_RX_MPDU_LEN(rx_Packet_info), WMA_GET_RX_MPDU_LEN(rx_Packet_info),
MAC_ADDR_ARRAY(header->sa)); QDF_MAC_ADDR_ARRAY(header->sa));
/* Validate IE information before processing Probe Response Frame */ /* Validate IE information before processing Probe Response Frame */
if (lim_validate_ie_information_in_probe_rsp_frame(mac_ctx, if (lim_validate_ie_information_in_probe_rsp_frame(mac_ctx,
@@ -144,7 +144,7 @@ lim_process_probe_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_Packet_info
QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
FL("Probe Resp Frame Received: BSSID " FL("Probe Resp Frame Received: BSSID "
MAC_ADDRESS_STR " (RSSI %d)"), MAC_ADDRESS_STR " (RSSI %d)"),
MAC_ADDR_ARRAY(header->bssId), QDF_MAC_ADDR_ARRAY(header->bssId),
(uint) abs((int8_t)WMA_GET_RX_RSSI_NORMALIZED(rx_Packet_info))); (uint) abs((int8_t)WMA_GET_RX_RSSI_NORMALIZED(rx_Packet_info)));
/* Get pointer to Probe Response frame body */ /* Get pointer to Probe Response frame body */
body = WMA_GET_RX_MPDU_DATA(rx_Packet_info); body = WMA_GET_RX_MPDU_DATA(rx_Packet_info);

View File

@@ -1027,7 +1027,7 @@ static void lim_update_sae_config(struct pe_session *session,
pe_debug("pmk_cached %d for BSSID=" MAC_ADDRESS_STR, pe_debug("pmk_cached %d for BSSID=" MAC_ADDRESS_STR,
session->sae_pmk_cached, session->sae_pmk_cached,
MAC_ADDR_ARRAY(sme_join_req->bssDescription.bssId)); QDF_MAC_ADDR_ARRAY(sme_join_req->bssDescription.bssId));
} }
#else #else
static inline void lim_update_sae_config(struct pe_session *session, static inline void lim_update_sae_config(struct pe_session *session,
@@ -1298,7 +1298,7 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
pe_err("Session(%d) Already exists for BSSID: " pe_err("Session(%d) Already exists for BSSID: "
MAC_ADDRESS_STR " in limSmeState = %X", MAC_ADDRESS_STR " in limSmeState = %X",
session_id, session_id,
MAC_ADDR_ARRAY(bss_desc->bssId), QDF_MAC_ADDR_ARRAY(bss_desc->bssId),
session->limSmeState); session->limSmeState);
if (session->limSmeState == eLIM_SME_LINK_EST_STATE && if (session->limSmeState == eLIM_SME_LINK_EST_STATE &&
@@ -2066,7 +2066,7 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac,
if (!pe_session) { if (!pe_session) {
pe_err("session does not exist for given bssId " pe_err("session does not exist for given bssId "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(smeDisassocReq.bssid.bytes)); QDF_MAC_ADDR_ARRAY(smeDisassocReq.bssid.bytes));
retCode = eSIR_SME_INVALID_PARAMETERS; retCode = eSIR_SME_INVALID_PARAMETERS;
disassocTrigger = eLIM_HOST_DISASSOC; disassocTrigger = eLIM_HOST_DISASSOC;
goto sendDisassoc; goto sendDisassoc;
@@ -2075,7 +2075,7 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac,
MAC_ADDRESS_STR, smesessionId, MAC_ADDRESS_STR, smesessionId,
GET_LIM_SYSTEM_ROLE(pe_session), smeDisassocReq.reasonCode, GET_LIM_SYSTEM_ROLE(pe_session), smeDisassocReq.reasonCode,
mac->lim.gLimSmeState, mac->lim.gLimSmeState,
MAC_ADDR_ARRAY(smeDisassocReq.peer_macaddr.bytes)); QDF_MAC_ADDR_ARRAY(smeDisassocReq.peer_macaddr.bytes));
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */
lim_diag_event_report(mac, WLAN_PE_DIAG_DISASSOC_REQ_EVENT, pe_session, lim_diag_event_report(mac, WLAN_PE_DIAG_DISASSOC_REQ_EVENT, pe_session,
@@ -2337,7 +2337,7 @@ void __lim_process_sme_disassoc_cnf(struct mac_context *mac, uint32_t *pMsgBuf)
if (!sta) { if (!sta) {
pe_err("DISASSOC_CNF for a STA with no context, addr= " pe_err("DISASSOC_CNF for a STA with no context, addr= "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes)); QDF_MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes));
status = lim_prepare_disconnect_done_ind(mac, &msg, status = lim_prepare_disconnect_done_ind(mac, &msg,
pe_session->smeSessionId, pe_session->smeSessionId,
eSIR_SME_INVALID_PARAMETERS, eSIR_SME_INVALID_PARAMETERS,
@@ -2354,7 +2354,7 @@ void __lim_process_sme_disassoc_cnf(struct mac_context *mac, uint32_t *pMsgBuf)
(sta->mlmStaContext.mlmState == (sta->mlmStaContext.mlmState ==
eLIM_MLM_WT_DEL_BSS_RSP_STATE)) { eLIM_MLM_WT_DEL_BSS_RSP_STATE)) {
pe_err("No need of cleanup for addr:" MAC_ADDRESS_STR "as MLM state is %d", pe_err("No need of cleanup for addr:" MAC_ADDRESS_STR "as MLM state is %d",
MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes), QDF_MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes),
sta->mlmStaContext.mlmState); sta->mlmStaContext.mlmState);
status = lim_prepare_disconnect_done_ind(mac, &msg, status = lim_prepare_disconnect_done_ind(mac, &msg,
pe_session->smeSessionId, pe_session->smeSessionId,
@@ -2430,7 +2430,7 @@ static void __lim_process_sme_deauth_req(struct mac_context *mac_ctx,
MAC_ADDRESS_STR, sme_session_id, MAC_ADDRESS_STR, sme_session_id,
GET_LIM_SYSTEM_ROLE(session_entry), sme_deauth_req.reasonCode, GET_LIM_SYSTEM_ROLE(session_entry), sme_deauth_req.reasonCode,
session_entry->limSmeState, session_entry->limSmeState,
MAC_ADDR_ARRAY(sme_deauth_req.peer_macaddr.bytes)); QDF_MAC_ADDR_ARRAY(sme_deauth_req.peer_macaddr.bytes));
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */
lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_DEAUTH_REQ_EVENT, lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_DEAUTH_REQ_EVENT,
session_entry, 0, sme_deauth_req.reasonCode); session_entry, 0, sme_deauth_req.reasonCode);
@@ -3334,7 +3334,7 @@ static void __lim_process_sme_delts_req(struct mac_context *mac, uint32_t *pMsgB
pe_debug("Sent DELTS request to station with assocId = %d MacAddr = " pe_debug("Sent DELTS request to station with assocId = %d MacAddr = "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
pDeltsReq->aid, MAC_ADDR_ARRAY(peerMacAddr)); pDeltsReq->aid, QDF_MAC_ADDR_ARRAY(peerMacAddr));
lim_send_delts_req_action_frame(mac, peerMacAddr, lim_send_delts_req_action_frame(mac, peerMacAddr,
pDeltsReq->req.wmeTspecPresent, pDeltsReq->req.wmeTspecPresent,
@@ -4267,14 +4267,14 @@ static void __lim_process_send_disassoc_frame(struct mac_context *mac_ctx,
req->session_id); req->session_id);
if (!session_entry) { if (!session_entry) {
pe_err("session does not exist for given bssId " pe_err("session does not exist for given bssId "
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(req->peer_mac)); MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(req->peer_mac));
return; return;
} }
pe_debug("msg_type->%d len->%d sess_id->%d mac->" pe_debug("msg_type->%d len->%d sess_id->%d mac->"
MAC_ADDRESS_STR " reason->%d wait_for_ack->%d", MAC_ADDRESS_STR " reason->%d wait_for_ack->%d",
req->msg_type, req->length, req->session_id, req->msg_type, req->length, req->session_id,
MAC_ADDR_ARRAY(req->peer_mac), req->reason, req->wait_for_ack); QDF_MAC_ADDR_ARRAY(req->peer_mac), req->reason, req->wait_for_ack);
lim_send_disassoc_mgmt_frame(mac_ctx, req->reason, req->peer_mac, lim_send_disassoc_mgmt_frame(mac_ctx, req->reason, req->peer_mac,
session_entry, req->wait_for_ack); session_entry, req->wait_for_ack);
@@ -5339,7 +5339,7 @@ static void lim_process_modify_add_ies(struct mac_context *mac_ctx,
if (!session_entry) { if (!session_entry) {
pe_err("Session not found for given bssid" pe_err("Session not found for given bssid"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(modify_add_ies->modifyIE.bssid.bytes)); QDF_MAC_ADDR_ARRAY(modify_add_ies->modifyIE.bssid.bytes));
goto end; goto end;
} }
if ((0 == modify_add_ies->modifyIE.ieBufferlength) || if ((0 == modify_add_ies->modifyIE.ieBufferlength) ||
@@ -5430,7 +5430,7 @@ static void lim_process_update_add_ies(struct mac_context *mac_ctx,
if (!session_entry) { if (!session_entry) {
pe_debug("Session not found for given bssid" pe_debug("Session not found for given bssid"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(update_ie->bssid.bytes)); QDF_MAC_ADDR_ARRAY(update_ie->bssid.bytes));
goto end; goto end;
} }
addn_ie = &session_entry->add_ie_params; addn_ie = &session_entry->add_ie_params;
@@ -5660,7 +5660,7 @@ static void lim_process_sme_dfs_csa_ie_request(struct mac_context *mac_ctx,
dfs_csa_ie_req->bssid, &session_id); dfs_csa_ie_req->bssid, &session_id);
if (!session_entry) { if (!session_entry) {
pe_err("Session not found for given BSSID" MAC_ADDRESS_STR, pe_err("Session not found for given BSSID" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(dfs_csa_ie_req->bssid)); QDF_MAC_ADDR_ARRAY(dfs_csa_ie_req->bssid));
return; return;
} }

View File

@@ -426,9 +426,9 @@ static uint32_t lim_prepare_tdls_frame_header(struct mac_context *mac, uint8_t *
MAC_ADDRESS_STR", A2:"MAC_ADDRESS_STR", A3:" MAC_ADDRESS_STR", A2:"MAC_ADDRESS_STR", A3:"
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
(tdlsLinkType == TDLS_LINK_AP) ? "AP" : "DIRECT", (tdlsLinkType == TDLS_LINK_AP) ? "AP" : "DIRECT",
MAC_ADDR_ARRAY(pMacHdr->addr1), QDF_MAC_ADDR_ARRAY(pMacHdr->addr1),
MAC_ADDR_ARRAY(pMacHdr->addr2), QDF_MAC_ADDR_ARRAY(pMacHdr->addr2),
MAC_ADDR_ARRAY(pMacHdr->addr3)); QDF_MAC_ADDR_ARRAY(pMacHdr->addr3));
if (pMacHdr->fc.subType == SIR_MAC_DATA_QOS_DATA) { if (pMacHdr->fc.subType == SIR_MAC_DATA_QOS_DATA) {
pMacHdr->qosControl.tid = tid; pMacHdr->qosControl.tid = tid;
@@ -638,7 +638,7 @@ static QDF_STATUS lim_send_tdls_dis_req_frame(struct mac_context *mac,
pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR, pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR,
SIR_MAC_TDLS_DIS_REQ, SIR_MAC_TDLS_DIS_REQ,
lim_trace_tdls_action_string(SIR_MAC_TDLS_DIS_REQ), lim_trace_tdls_action_string(SIR_MAC_TDLS_DIS_REQ),
MAC_ADDR_ARRAY(peer_mac.bytes)); QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
mac->lim.tdls_frm_session_id = pe_session->smeSessionId; mac->lim.tdls_frm_session_id = pe_session->smeSessionId;
lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame, lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame,
@@ -941,7 +941,7 @@ static QDF_STATUS lim_send_tdls_dis_rsp_frame(struct mac_context *mac,
pe_debug("[TDLS] action: %d (%s) -DIRECT-> OTA peer="MAC_ADDRESS_STR, pe_debug("[TDLS] action: %d (%s) -DIRECT-> OTA peer="MAC_ADDRESS_STR,
SIR_MAC_TDLS_DIS_RSP, SIR_MAC_TDLS_DIS_RSP,
lim_trace_tdls_action_string(SIR_MAC_TDLS_DIS_RSP), lim_trace_tdls_action_string(SIR_MAC_TDLS_DIS_RSP),
MAC_ADDR_ARRAY(peer_mac.bytes)); QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
mac->lim.tdls_frm_session_id = pe_session->smeSessionId; mac->lim.tdls_frm_session_id = pe_session->smeSessionId;
lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame, lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame,
@@ -1003,7 +1003,7 @@ static void populate_dotf_tdls_vht_aid(struct mac_context *mac, uint32_t selfDot
Aid->present = 0; Aid->present = 0;
pe_err("sta is NULL for " pe_err("sta is NULL for "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peerMac.bytes)); QDF_MAC_ADDR_ARRAY(peerMac.bytes));
} }
} }
} else { } else {
@@ -1315,7 +1315,7 @@ QDF_STATUS lim_send_tdls_link_setup_req_frame(struct mac_context *mac,
pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR, pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR,
SIR_MAC_TDLS_SETUP_REQ, SIR_MAC_TDLS_SETUP_REQ,
lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_REQ), lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_REQ),
MAC_ADDR_ARRAY(peer_mac.bytes)); QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
mac->lim.tdls_frm_session_id = pe_session->smeSessionId; mac->lim.tdls_frm_session_id = pe_session->smeSessionId;
lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame, lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame,
@@ -1508,7 +1508,7 @@ QDF_STATUS lim_send_tdls_teardown_frame(struct mac_context *mac,
lim_trace_tdls_action_string(SIR_MAC_TDLS_TEARDOWN), lim_trace_tdls_action_string(SIR_MAC_TDLS_TEARDOWN),
((reason == eSIR_MAC_TDLS_TEARDOWN_PEER_UNREACHABLE) ? "AP" : ((reason == eSIR_MAC_TDLS_TEARDOWN_PEER_UNREACHABLE) ? "AP" :
"DIRECT"), "DIRECT"),
MAC_ADDR_ARRAY(peer_mac.bytes)); QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
mac->lim.tdls_frm_session_id = pe_session->smeSessionId; mac->lim.tdls_frm_session_id = pe_session->smeSessionId;
lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame, lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame,
@@ -1767,7 +1767,7 @@ static QDF_STATUS lim_send_tdls_setup_rsp_frame(struct mac_context *mac,
pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR, pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR,
SIR_MAC_TDLS_SETUP_RSP, SIR_MAC_TDLS_SETUP_RSP,
lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_RSP), lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_RSP),
MAC_ADDR_ARRAY(peer_mac.bytes)); QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
mac->lim.tdls_frm_session_id = pe_session->smeSessionId; mac->lim.tdls_frm_session_id = pe_session->smeSessionId;
lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame, lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame,
@@ -1974,7 +1974,7 @@ QDF_STATUS lim_send_tdls_link_setup_cnf_frame(struct mac_context *mac,
pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR, pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR,
SIR_MAC_TDLS_SETUP_CNF, SIR_MAC_TDLS_SETUP_CNF,
lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_CNF), lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_CNF),
MAC_ADDR_ARRAY(peer_mac.bytes)); QDF_MAC_ADDR_ARRAY(peer_mac.bytes));
mac->lim.tdls_frm_session_id = pe_session->smeSessionId; mac->lim.tdls_frm_session_id = pe_session->smeSessionId;
lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame, lim_diag_mgmt_tx_event_report(mac, (tpSirMacMgmtHdr) pFrame,
@@ -2555,13 +2555,13 @@ static QDF_STATUS lim_tdls_setup_add_sta(struct mac_context *mac,
if (sta && pAddStaReq->tdls_oper == TDLS_OPER_ADD) { if (sta && pAddStaReq->tdls_oper == TDLS_OPER_ADD) {
pe_err("TDLS entry for peer: "MAC_ADDRESS_STR " already exist, cannot add new entry", pe_err("TDLS entry for peer: "MAC_ADDRESS_STR " already exist, cannot add new entry",
MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes)); QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
if (sta && sta->staType != STA_ENTRY_TDLS_PEER) { if (sta && sta->staType != STA_ENTRY_TDLS_PEER) {
pe_err("Non TDLS entry for peer: "MAC_ADDRESS_STR " already exist", pe_err("Non TDLS entry for peer: "MAC_ADDRESS_STR " already exist",
MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes)); QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -2570,7 +2570,7 @@ static QDF_STATUS lim_tdls_setup_add_sta(struct mac_context *mac,
if (!aid) { if (!aid) {
pe_err("No more free AID for peer: "MAC_ADDRESS_STR, pe_err("No more free AID for peer: "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes)); QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -2578,7 +2578,7 @@ static QDF_STATUS lim_tdls_setup_add_sta(struct mac_context *mac,
SET_PEER_AID_BITMAP(pe_session->peerAIDBitmap, aid); SET_PEER_AID_BITMAP(pe_session->peerAIDBitmap, aid);
pe_debug("Aid: %d, for peer: " MAC_ADDRESS_STR, pe_debug("Aid: %d, for peer: " MAC_ADDRESS_STR,
aid, MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes)); aid, QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes));
sta = sta =
dph_get_hash_entry(mac, aid, dph_get_hash_entry(mac, aid,
&pe_session->dph.dphHashTable); &pe_session->dph.dphHashTable);
@@ -2633,7 +2633,7 @@ static QDF_STATUS lim_tdls_del_sta(struct mac_context *mac,
if (sta) { if (sta) {
pe_debug("DEL STA peer MAC: "MAC_ADDRESS_STR, pe_debug("DEL STA peer MAC: "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(sta->staAddr)); QDF_MAC_ADDR_ARRAY(sta->staAddr));
pe_debug("STA type: %x, sta idx: %x resp_reqd: %d", pe_debug("STA type: %x, sta idx: %x resp_reqd: %d",
sta->staType, sta->staType,
@@ -2643,7 +2643,7 @@ static QDF_STATUS lim_tdls_del_sta(struct mac_context *mac,
status = lim_del_sta(mac, sta, resp_reqd, pe_session); status = lim_del_sta(mac, sta, resp_reqd, pe_session);
} else { } else {
pe_debug("DEL STA peer MAC: "MAC_ADDRESS_STR" not found", pe_debug("DEL STA peer MAC: "MAC_ADDRESS_STR" not found",
MAC_ADDR_ARRAY(peerMac.bytes)); QDF_MAC_ADDR_ARRAY(peerMac.bytes));
} }
return status; return status;
@@ -2711,7 +2711,7 @@ QDF_STATUS lim_process_tdls_add_sta_rsp(struct mac_context *mac, void *msg,
SET_LIM_PROCESS_DEFD_MESGS(mac, true); SET_LIM_PROCESS_DEFD_MESGS(mac, true);
pe_debug("staIdx: %d, staMac: "MAC_ADDRESS_STR, pe_debug("staIdx: %d, staMac: "MAC_ADDRESS_STR,
pAddStaParams->staIdx, pAddStaParams->staIdx,
MAC_ADDR_ARRAY(pAddStaParams->staMac)); QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac));
if (pAddStaParams->status != QDF_STATUS_SUCCESS) { if (pAddStaParams->status != QDF_STATUS_SUCCESS) {
QDF_ASSERT(0); QDF_ASSERT(0);
@@ -3111,7 +3111,7 @@ static void lim_check_aid_and_delete_peer(struct mac_context *p_mac,
goto skip; goto skip;
pe_debug("Deleting "MAC_ADDRESS_STR, pe_debug("Deleting "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(stads->staAddr)); QDF_MAC_ADDR_ARRAY(stads->staAddr));
if (!lim_is_roam_synch_in_progress(session_entry)) { if (!lim_is_roam_synch_in_progress(session_entry)) {
lim_send_deauth_mgmt_frame(p_mac, lim_send_deauth_mgmt_frame(p_mac,
@@ -3126,7 +3126,7 @@ static void lim_check_aid_and_delete_peer(struct mac_context *p_mac,
session_entry, false); session_entry, false);
if (status != QDF_STATUS_SUCCESS) if (status != QDF_STATUS_SUCCESS)
pe_debug("peer "MAC_ADDRESS_STR" not found", pe_debug("peer "MAC_ADDRESS_STR" not found",
MAC_ADDR_ARRAY(stads->staAddr)); QDF_MAC_ADDR_ARRAY(stads->staAddr));
} }
dph_delete_hash_entry(p_mac, dph_delete_hash_entry(p_mac,

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -115,7 +115,7 @@ lim_collect_bss_description(struct mac_context *mac,
if (!pBssDescr->beaconInterval) { if (!pBssDescr->beaconInterval) {
pe_warn("Beacon Interval is ZERO, making it to default 100 " pe_warn("Beacon Interval is ZERO, making it to default 100 "
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pHdr->bssId)); MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pHdr->bssId));
pBssDescr->beaconInterval = 100; pBssDescr->beaconInterval = 100;
} }
/* /*
@@ -148,7 +148,7 @@ lim_collect_bss_description(struct mac_context *mac,
/* SINR no longer reported by HW */ /* SINR no longer reported by HW */
pBssDescr->sinr = 0; pBssDescr->sinr = 0;
pe_debug(MAC_ADDRESS_STR " rssi: normalized: %d, absolute: %d", pe_debug(MAC_ADDRESS_STR " rssi: normalized: %d, absolute: %d",
MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->rssi, QDF_MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->rssi,
pBssDescr->rssi_raw); pBssDescr->rssi_raw);
pBssDescr->received_time = (uint64_t)qdf_mc_timer_get_system_time(); pBssDescr->received_time = (uint64_t)qdf_mc_timer_get_system_time();

View File

@@ -2245,7 +2245,7 @@ lim_send_auth_mgmt_frame(struct mac_context *mac_ctx,
* 4 bytes each for IV & ICV. * 4 bytes each for IV & ICV.
*/ */
pe_debug("Sending encrypted auth frame to " MAC_ADDRESS_STR, pe_debug("Sending encrypted auth frame to " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_addr)); QDF_MAC_ADDR_ARRAY(peer_addr));
body_len = wep_challenge_len + LIM_ENCR_AUTH_INFO_LEN; body_len = wep_challenge_len + LIM_ENCR_AUTH_INFO_LEN;
frame_len = sizeof(tSirMacMgmtHdr) + body_len; frame_len = sizeof(tSirMacMgmtHdr) + body_len;
@@ -2258,7 +2258,7 @@ lim_send_auth_mgmt_frame(struct mac_context *mac_ctx,
auth_frame->authTransactionSeqNumber, auth_frame->authTransactionSeqNumber,
auth_frame->authStatusCode, auth_frame->authStatusCode,
(auth_frame->authStatusCode == eSIR_MAC_SUCCESS_STATUS), (auth_frame->authStatusCode == eSIR_MAC_SUCCESS_STATUS),
MAC_ADDR_ARRAY(peer_addr)); QDF_MAC_ADDR_ARRAY(peer_addr));
switch (auth_frame->authTransactionSeqNumber) { switch (auth_frame->authTransactionSeqNumber) {
case SIR_MAC_AUTH_FRAME_1: case SIR_MAC_AUTH_FRAME_1:
@@ -2394,7 +2394,7 @@ alloc_packet:
qdf_mem_copy(body, (uint8_t *) auth_frame, body_len); qdf_mem_copy(body, (uint8_t *) auth_frame, body_len);
pe_debug("Sending Auth seq# 3 to " MAC_ADDRESS_STR, pe_debug("Sending Auth seq# 3 to " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(mac_hdr->da)); QDF_MAC_ADDR_ARRAY(mac_hdr->da));
} else { } else {
*((uint16_t *) (body)) = *((uint16_t *) (body)) =
@@ -2485,7 +2485,7 @@ alloc_packet:
auth_frame->authStatusCode, auth_frame->authStatusCode,
(auth_frame->authStatusCode == (auth_frame->authStatusCode ==
eSIR_MAC_SUCCESS_STATUS), eSIR_MAC_SUCCESS_STATUS),
MAC_ADDR_ARRAY(mac_hdr->da)); QDF_MAC_ADDR_ARRAY(mac_hdr->da));
} }
QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE,
QDF_TRACE_LEVEL_DEBUG, QDF_TRACE_LEVEL_DEBUG,
@@ -2892,8 +2892,8 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac,
pe_debug("***Sessionid %d Sending Disassociation frame with " pe_debug("***Sessionid %d Sending Disassociation frame with "
"reason %u and waitForAck %d to " MAC_ADDRESS_STR " ,From " "reason %u and waitForAck %d to " MAC_ADDRESS_STR " ,From "
MAC_ADDRESS_STR, pe_session->peSessionId, nReason, MAC_ADDRESS_STR, pe_session->peSessionId, nReason,
waitForAck, MAC_ADDR_ARRAY(pMacHdr->da), waitForAck, QDF_MAC_ADDR_ARRAY(pMacHdr->da),
MAC_ADDR_ARRAY(pe_session->selfMacAddr)); QDF_MAC_ADDR_ARRAY(pe_session->selfMacAddr));
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE) || || (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
@@ -3068,8 +3068,8 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac,
"reason %u and waitForAck %d to " MAC_ADDRESS_STR "reason %u and waitForAck %d to " MAC_ADDRESS_STR
" ,From " MAC_ADDRESS_STR, " ,From " MAC_ADDRESS_STR,
pe_session->peSessionId, nReason, waitForAck, pe_session->peSessionId, nReason, waitForAck,
MAC_ADDR_ARRAY(pMacHdr->da), QDF_MAC_ADDR_ARRAY(pMacHdr->da),
MAC_ADDR_ARRAY(pe_session->selfMacAddr)); QDF_MAC_ADDR_ARRAY(pe_session->selfMacAddr));
if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel)) if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
|| (pe_session->pePersona == QDF_P2P_CLIENT_MODE) || || (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
@@ -3653,7 +3653,7 @@ lim_send_extended_chan_switch_action_frame(struct mac_context *mac_ctx,
} }
pe_debug("Send Ext channel Switch to :"MAC_ADDRESS_STR" with swcount %d, swmode %d , newchannel %d newops %d", pe_debug("Send Ext channel Switch to :"MAC_ADDRESS_STR" with swcount %d, swmode %d , newchannel %d newops %d",
MAC_ADDR_ARRAY(mac_hdr->da), QDF_MAC_ADDR_ARRAY(mac_hdr->da),
frm.ext_chan_switch_ann_action.switch_count, frm.ext_chan_switch_ann_action.switch_count,
frm.ext_chan_switch_ann_action.switch_mode, frm.ext_chan_switch_ann_action.switch_mode,
frm.ext_chan_switch_ann_action.new_channel, frm.ext_chan_switch_ann_action.new_channel,
@@ -3807,7 +3807,7 @@ lim_p2p_oper_chan_change_confirm_action_frame(struct mac_context *mac_ctx,
} }
pe_debug("Send frame on channel %d to mac " pe_debug("Send frame on channel %d to mac "
MAC_ADDRESS_STR, session_entry->currentOperChannel, MAC_ADDRESS_STR, session_entry->currentOperChannel,
MAC_ADDR_ARRAY(peer)); QDF_MAC_ADDR_ARRAY(peer));
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
session_entry->peSessionId, mac_hdr->fc.subType)); session_entry->peSessionId, mac_hdr->fc.subType));

View File

@@ -659,7 +659,7 @@ void lim_send_sme_disassoc_ntf(struct mac_context *mac,
* Initiate new entry for other session * Initiate new entry for other session
*/ */
pe_debug("Rcvd eLIM_DUPLICATE_ENTRY for " MAC_ADDRESS_STR, pe_debug("Rcvd eLIM_DUPLICATE_ENTRY for " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peerMacAddr)); QDF_MAC_ADDR_ARRAY(peerMacAddr));
for (i = 0; i < mac->lim.maxBssId; i++) { for (i = 0; i < mac->lim.maxBssId; i++) {
session = &mac->lim.gpSession[i]; session = &mac->lim.gpSession[i];
@@ -706,7 +706,7 @@ void lim_send_sme_disassoc_ntf(struct mac_context *mac,
} }
pe_debug("send eWNI_SME_DISASSOC_RSP with retCode: %d for " pe_debug("send eWNI_SME_DISASSOC_RSP with retCode: %d for "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
reasonCode, MAC_ADDR_ARRAY(peerMacAddr)); reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
pSirSmeDisassocRsp->messageType = eWNI_SME_DISASSOC_RSP; pSirSmeDisassocRsp->messageType = eWNI_SME_DISASSOC_RSP;
pSirSmeDisassocRsp->length = sizeof(struct disassoc_rsp); pSirSmeDisassocRsp->length = sizeof(struct disassoc_rsp);
pSirSmeDisassocRsp->sessionId = smesessionId; pSirSmeDisassocRsp->sessionId = smesessionId;
@@ -747,7 +747,7 @@ void lim_send_sme_disassoc_ntf(struct mac_context *mac,
} }
pe_debug("send eWNI_SME_DISASSOC_IND with retCode: %d for " pe_debug("send eWNI_SME_DISASSOC_IND with retCode: %d for "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
reasonCode, MAC_ADDR_ARRAY(peerMacAddr)); reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
pSirSmeDisassocInd->messageType = eWNI_SME_DISASSOC_IND; pSirSmeDisassocInd->messageType = eWNI_SME_DISASSOC_IND;
pSirSmeDisassocInd->length = sizeof(*pSirSmeDisassocInd); pSirSmeDisassocInd->length = sizeof(*pSirSmeDisassocInd);
pSirSmeDisassocInd->sessionId = smesessionId; pSirSmeDisassocInd->sessionId = smesessionId;
@@ -919,7 +919,7 @@ lim_send_sme_tdls_del_sta_ind(struct mac_context *mac, tpDphHashNode sta,
struct tdls_event_info info; struct tdls_event_info info;
pe_debug("Delete TDLS Peer "MAC_ADDRESS_STR "with reason code: %d", pe_debug("Delete TDLS Peer "MAC_ADDRESS_STR "with reason code: %d",
MAC_ADDR_ARRAY(sta->staAddr), reasonCode); QDF_MAC_ADDR_ARRAY(sta->staAddr), reasonCode);
info.vdev_id = pe_session->smeSessionId; info.vdev_id = pe_session->smeSessionId;
qdf_mem_copy(info.peermac.bytes, sta->staAddr, QDF_MAC_ADDR_SIZE); qdf_mem_copy(info.peermac.bytes, sta->staAddr, QDF_MAC_ADDR_SIZE);
info.message_type = TDLS_PEER_DISCONNECTED; info.message_type = TDLS_PEER_DISCONNECTED;
@@ -1046,7 +1046,7 @@ void lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
return; return;
pe_debug("send eWNI_SME_DEAUTH_RSP with retCode: %d for " pe_debug("send eWNI_SME_DEAUTH_RSP with retCode: %d for "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
reasonCode, MAC_ADDR_ARRAY(peerMacAddr)); reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
pSirSmeDeauthRsp->messageType = eWNI_SME_DEAUTH_RSP; pSirSmeDeauthRsp->messageType = eWNI_SME_DEAUTH_RSP;
pSirSmeDeauthRsp->length = sizeof(*pSirSmeDeauthRsp); pSirSmeDeauthRsp->length = sizeof(*pSirSmeDeauthRsp);
pSirSmeDeauthRsp->statusCode = reasonCode; pSirSmeDeauthRsp->statusCode = reasonCode;
@@ -1084,7 +1084,7 @@ void lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
return; return;
pe_debug("send eWNI_SME_DEAUTH_IND with retCode: %d for " pe_debug("send eWNI_SME_DEAUTH_IND with retCode: %d for "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
reasonCode, MAC_ADDR_ARRAY(peerMacAddr)); reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr));
pSirSmeDeauthInd->messageType = eWNI_SME_DEAUTH_IND; pSirSmeDeauthInd->messageType = eWNI_SME_DEAUTH_IND;
pSirSmeDeauthInd->length = sizeof(*pSirSmeDeauthInd); pSirSmeDeauthInd->length = sizeof(*pSirSmeDeauthInd);
pSirSmeDeauthInd->reasonCode = eSIR_MAC_UNSPEC_FAILURE_REASON; pSirSmeDeauthInd->reasonCode = eSIR_MAC_UNSPEC_FAILURE_REASON;
@@ -1961,7 +1961,7 @@ void lim_send_sme_max_assoc_exceeded_ntf(struct mac_context *mac, tSirMacAddr pe
mmhMsg.type = pSmeMaxAssocInd->mesgType; mmhMsg.type = pSmeMaxAssocInd->mesgType;
mmhMsg.bodyptr = pSmeMaxAssocInd; mmhMsg.bodyptr = pSmeMaxAssocInd;
pe_debug("msgType: %s peerMacAddr "MAC_ADDRESS_STR "sme session id %d", pe_debug("msgType: %s peerMacAddr "MAC_ADDRESS_STR "sme session id %d",
"eWNI_SME_MAX_ASSOC_EXCEEDED", MAC_ADDR_ARRAY(peerMacAddr), "eWNI_SME_MAX_ASSOC_EXCEEDED", QDF_MAC_ADDR_ARRAY(peerMacAddr),
pSmeMaxAssocInd->sessionId); pSmeMaxAssocInd->sessionId);
MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG, MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG,
smesessionId, mmhMsg.type)); smesessionId, mmhMsg.type));

View File

@@ -443,7 +443,7 @@ void lim_set_bcn_probe_filter(struct mac_context *mac_ctx,
filter->num_sta_sessions++; filter->num_sta_sessions++;
sir_copy_mac_addr(filter->sta_bssid[session_id], *bssid); sir_copy_mac_addr(filter->sta_bssid[session_id], *bssid);
pe_debug("Set filter for STA Session %d bssid "MAC_ADDRESS_STR, pe_debug("Set filter for STA Session %d bssid "MAC_ADDRESS_STR,
session_id, MAC_ADDR_ARRAY(*bssid)); session_id, QDF_MAC_ADDR_ARRAY(*bssid));
} else if (eSIR_IBSS_MODE == bss_type) { } else if (eSIR_IBSS_MODE == bss_type) {
if (!ibss_ssid) { if (!ibss_ssid) {
pe_err("IBSS Type with NULL SSID"); pe_err("IBSS Type with NULL SSID");
@@ -640,7 +640,7 @@ struct pe_session *pe_create_session(struct mac_context *mac,
mac->mlme_cfg->obss_ht40.obss_color_collision_offload_enabled; mac->mlme_cfg->obss_ht40.obss_color_collision_offload_enabled;
pe_debug("Create a new PE session: %d BSSID: "MAC_ADDRESS_STR" Max No of STA: %d", pe_debug("Create a new PE session: %d BSSID: "MAC_ADDRESS_STR" Max No of STA: %d",
*sessionId, MAC_ADDR_ARRAY(bssid), numSta); *sessionId, QDF_MAC_ADDR_ARRAY(bssid), numSta);
if (eSIR_INFRA_AP_MODE == bssType || eSIR_IBSS_MODE == bssType) { if (eSIR_INFRA_AP_MODE == bssType || eSIR_IBSS_MODE == bssType) {
session_ptr->pSchProbeRspTemplate = session_ptr->pSchProbeRspTemplate =
@@ -879,7 +879,7 @@ void pe_delete_session(struct mac_context *mac_ctx, struct pe_session *session)
pe_debug("Trying to delete PE session: %d Opmode: %d BssIdx: %d BSSID: "MAC_ADDRESS_STR, pe_debug("Trying to delete PE session: %d Opmode: %d BssIdx: %d BSSID: "MAC_ADDRESS_STR,
session->peSessionId, session->operMode, session->peSessionId, session->operMode,
session->bssIdx, session->bssIdx,
MAC_ADDR_ARRAY(session->bssId)); QDF_MAC_ADDR_ARRAY(session->bssId));
lim_reset_bcn_probe_filter(mac_ctx, session); lim_reset_bcn_probe_filter(mac_ctx, session);

View File

@@ -636,7 +636,7 @@ void lim_cleanup_mlm(struct mac_context *mac_ctx)
void lim_print_mac_addr(struct mac_context *mac, tSirMacAddr macAddr, uint8_t logLevel) void lim_print_mac_addr(struct mac_context *mac, tSirMacAddr macAddr, uint8_t logLevel)
{ {
pe_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(macAddr)); pe_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(macAddr));
} /****** end lim_print_mac_addr() ******/ } /****** end lim_print_mac_addr() ******/
/* /*
@@ -6613,7 +6613,7 @@ bool lim_is_valid_frame(last_processed_msg *last_processed_frm,
if (last_processed_frm->seq_num == seq_num && if (last_processed_frm->seq_num == seq_num &&
qdf_mem_cmp(last_processed_frm->sa, pHdr->sa, ETH_ALEN) == 0) { qdf_mem_cmp(last_processed_frm->sa, pHdr->sa, ETH_ALEN) == 0) {
pe_err("Duplicate frame from "MAC_ADDRESS_STR " Seq Number %d", pe_err("Duplicate frame from "MAC_ADDRESS_STR " Seq Number %d",
MAC_ADDR_ARRAY(pHdr->sa), seq_num); QDF_MAC_ADDR_ARRAY(pHdr->sa), seq_num);
return false; return false;
} }
return true; return true;
@@ -7587,7 +7587,7 @@ struct csr_roam_session *lim_get_session_by_macaddr(struct mac_context *mac_ctx,
QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
FL("session %d exists with mac address " FL("session %d exists with mac address "
MAC_ADDRESS_STR), session->sessionId, MAC_ADDRESS_STR), session->sessionId,
MAC_ADDR_ARRAY(self_mac)); QDF_MAC_ADDR_ARRAY(self_mac));
return session; return session;
} }

View File

@@ -73,7 +73,7 @@ static QDF_STATUS lim_add_ndi_peer(struct mac_context *mac_ctx,
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
pe_info("Need to create NDI Peer :" MAC_ADDRESS_STR, pe_info("Need to create NDI Peer :" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_mac_addr.bytes)); QDF_MAC_ADDR_ARRAY(peer_mac_addr.bytes));
peer_idx = lim_assign_peer_idx(mac_ctx, session); peer_idx = lim_assign_peer_idx(mac_ctx, session);
if (!peer_idx) { if (!peer_idx) {
@@ -137,7 +137,7 @@ static void lim_ndp_delete_peer_by_addr(struct mac_context *mac_ctx, uint8_t vde
} }
pe_info("deleting peer: "MAC_ADDRESS_STR" confirm rejected", pe_info("deleting peer: "MAC_ADDRESS_STR" confirm rejected",
MAC_ADDR_ARRAY(peer_ndi_mac_addr.bytes)); QDF_MAC_ADDR_ARRAY(peer_ndi_mac_addr.bytes));
session = pe_find_session_by_sme_session_id(mac_ctx, vdev_id); session = pe_find_session_by_sme_session_id(mac_ctx, vdev_id);
if (!session || (session->bssType != eSIR_NDI_MODE)) { if (!session || (session->bssType != eSIR_NDI_MODE)) {
@@ -202,7 +202,7 @@ static void lim_ndp_delete_peers(struct mac_context *mac_ctx,
for (i = 0; i < num_peers; i++) { for (i = 0; i < num_peers; i++) {
pe_info("ndp_map[%d]: MAC: " MAC_ADDRESS_STR " num_active %d", pe_info("ndp_map[%d]: MAC: " MAC_ADDRESS_STR " num_active %d",
i, i,
MAC_ADDR_ARRAY(ndp_map[i].peer_ndi_mac_addr.bytes), QDF_MAC_ADDR_ARRAY(ndp_map[i].peer_ndi_mac_addr.bytes),
ndp_map[i].num_active_ndp_sessions); ndp_map[i].num_active_ndp_sessions);
/* Do not delete a peer with active NDPs */ /* Do not delete a peer with active NDPs */
@@ -307,7 +307,7 @@ void lim_process_ndi_del_sta_rsp(struct mac_context *mac_ctx,
} }
pe_info("Deleted STA AssocID %d staId %d MAC " MAC_ADDRESS_STR, pe_info("Deleted STA AssocID %d staId %d MAC " MAC_ADDRESS_STR,
sta_ds->assocId, sta_ds->staIndex, sta_ds->assocId, sta_ds->staIndex,
MAC_ADDR_ARRAY(sta_ds->staAddr)); QDF_MAC_ADDR_ARRAY(sta_ds->staAddr));
/* /*
* Copy peer info in del peer indication before * Copy peer info in del peer indication before
@@ -509,7 +509,7 @@ void lim_ndp_add_sta_rsp(struct mac_context *mac_ctx, struct pe_session *session
if (!sta_ds) { if (!sta_ds) {
pe_err("NAN: ADD_STA_RSP for unknown MAC addr " pe_err("NAN: ADD_STA_RSP for unknown MAC addr "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(add_sta_rsp->staMac)); QDF_MAC_ADDR_ARRAY(add_sta_rsp->staMac));
qdf_mem_free(add_sta_rsp); qdf_mem_free(add_sta_rsp);
return; return;
} }

View File

@@ -1504,7 +1504,7 @@ QDF_STATUS lim_process_obss_detection_ind(struct mac_context *mac_ctx,
pe_debug("obss detect ind id %d, reason %d, msk 0x%x, " MAC_ADDRESS_STR, pe_debug("obss detect ind id %d, reason %d, msk 0x%x, " MAC_ADDRESS_STR,
obss_detection->vdev_id, obss_detection->reason, obss_detection->vdev_id, obss_detection->reason,
obss_detection->matched_detection_masks, obss_detection->matched_detection_masks,
MAC_ADDR_ARRAY(obss_detection->matched_bssid_addr)); QDF_MAC_ADDR_ARRAY(obss_detection->matched_bssid_addr));
session = pe_find_session_by_sme_session_id(mac_ctx, session = pe_find_session_by_sme_session_id(mac_ctx,
obss_detection->vdev_id); obss_detection->vdev_id);

View File

@@ -117,23 +117,23 @@ QDF_STATUS sys_bbt_process_message_core(struct mac_context *mac_ctx,
mac_hdr = WMA_GET_RX_MAC_HEADER(bd_ptr); mac_hdr = WMA_GET_RX_MAC_HEADER(bd_ptr);
if (subtype == SIR_MAC_MGMT_ASSOC_REQ) { if (subtype == SIR_MAC_MGMT_ASSOC_REQ) {
pe_debug("ASSOC REQ frame allowed: da: " MAC_ADDRESS_STR ", sa: " MAC_ADDRESS_STR ", bssid: " MAC_ADDRESS_STR ", Assoc Req count so far: %d", pe_debug("ASSOC REQ frame allowed: da: " MAC_ADDRESS_STR ", sa: " MAC_ADDRESS_STR ", bssid: " MAC_ADDRESS_STR ", Assoc Req count so far: %d",
MAC_ADDR_ARRAY(mac_hdr->da), QDF_MAC_ADDR_ARRAY(mac_hdr->da),
MAC_ADDR_ARRAY(mac_hdr->sa), QDF_MAC_ADDR_ARRAY(mac_hdr->sa),
MAC_ADDR_ARRAY(mac_hdr->bssId), QDF_MAC_ADDR_ARRAY(mac_hdr->bssId),
mac_ctx->sys.gSysFrameCount[type][subtype]); mac_ctx->sys.gSysFrameCount[type][subtype]);
} }
if (subtype == SIR_MAC_MGMT_DEAUTH) { if (subtype == SIR_MAC_MGMT_DEAUTH) {
pe_debug("DEAUTH frame allowed: da: " MAC_ADDRESS_STR ", sa: " MAC_ADDRESS_STR ", bssid: " MAC_ADDRESS_STR ", DEAUTH count so far: %d", pe_debug("DEAUTH frame allowed: da: " MAC_ADDRESS_STR ", sa: " MAC_ADDRESS_STR ", bssid: " MAC_ADDRESS_STR ", DEAUTH count so far: %d",
MAC_ADDR_ARRAY(mac_hdr->da), QDF_MAC_ADDR_ARRAY(mac_hdr->da),
MAC_ADDR_ARRAY(mac_hdr->sa), QDF_MAC_ADDR_ARRAY(mac_hdr->sa),
MAC_ADDR_ARRAY(mac_hdr->bssId), QDF_MAC_ADDR_ARRAY(mac_hdr->bssId),
mac_ctx->sys.gSysFrameCount[type][subtype]); mac_ctx->sys.gSysFrameCount[type][subtype]);
} }
if (subtype == SIR_MAC_MGMT_DISASSOC) { if (subtype == SIR_MAC_MGMT_DISASSOC) {
pe_debug("DISASSOC frame allowed: da: " MAC_ADDRESS_STR ", sa: " MAC_ADDRESS_STR ", bssid: " MAC_ADDRESS_STR ", DISASSOC count so far: %d", pe_debug("DISASSOC frame allowed: da: " MAC_ADDRESS_STR ", sa: " MAC_ADDRESS_STR ", bssid: " MAC_ADDRESS_STR ", DISASSOC count so far: %d",
MAC_ADDR_ARRAY(mac_hdr->da), QDF_MAC_ADDR_ARRAY(mac_hdr->da),
MAC_ADDR_ARRAY(mac_hdr->sa), QDF_MAC_ADDR_ARRAY(mac_hdr->sa),
MAC_ADDR_ARRAY(mac_hdr->bssId), QDF_MAC_ADDR_ARRAY(mac_hdr->bssId),
mac_ctx->sys.gSysFrameCount[type][subtype]); mac_ctx->sys.gSysFrameCount[type][subtype]);
} }

View File

@@ -690,7 +690,7 @@ wlansap_roam_process_infra_assoc_ind(struct sap_context *sap_ctx,
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") fail"), FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") fail"),
roam_result, MAC_ADDR_ARRAY( roam_result, QDF_MAC_ADDR_ARRAY(
csr_roam_info->peerMac.bytes)); csr_roam_info->peerMac.bytes));
*ret_status = QDF_STATUS_E_FAILURE; *ret_status = QDF_STATUS_E_FAILURE;
} }
@@ -698,7 +698,7 @@ wlansap_roam_process_infra_assoc_ind(struct sap_context *sap_ctx,
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN,
FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") not allowed"), FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") not allowed"),
roam_result, roam_result,
MAC_ADDR_ARRAY(csr_roam_info->peerMac.bytes)); QDF_MAC_ADDR_ARRAY(csr_roam_info->peerMac.bytes));
*ret_status = QDF_STATUS_E_FAILURE; *ret_status = QDF_STATUS_E_FAILURE;
} }
return; return;

View File

@@ -3335,7 +3335,7 @@ void sap_print_acl(struct qdf_mac_addr *macList, uint8_t size)
macArray = (macList + i)->bytes; macArray = (macList + i)->bytes;
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"** ACL entry %i - " MAC_ADDRESS_STR, i, "** ACL entry %i - " MAC_ADDRESS_STR, i,
MAC_ADDR_ARRAY(macArray)); QDF_MAC_ADDR_ARRAY(macArray));
} }
return; return;
} }
@@ -3354,7 +3354,7 @@ QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sap_ctx,
(sap_ctx->denyMacList, sap_ctx->nDenyMac, peerMac, NULL)) { (sap_ctx->denyMacList, sap_ctx->nDenyMac, peerMac, NULL)) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Peer " MAC_ADDRESS_STR " in deny list", "In %s, Peer " MAC_ADDRESS_STR " in deny list",
__func__, MAC_ADDR_ARRAY(peerMac)); __func__, QDF_MAC_ADDR_ARRAY(peerMac));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
/* A new station CAN associate, unless in deny list. Less stringent mode */ /* A new station CAN associate, unless in deny list. Less stringent mode */
@@ -3366,7 +3366,7 @@ QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sap_ctx,
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Peer " MAC_ADDRESS_STR "In %s, Peer " MAC_ADDRESS_STR
" denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED", " denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED",
__func__, MAC_ADDR_ARRAY(peerMac)); __func__, QDF_MAC_ADDR_ARRAY(peerMac));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -3379,7 +3379,7 @@ QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sap_ctx,
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Peer " MAC_ADDRESS_STR "In %s, Peer " MAC_ADDRESS_STR
" denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY", " denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY",
__func__, MAC_ADDR_ARRAY(peerMac)); __func__, QDF_MAC_ADDR_ARRAY(peerMac));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;

View File

@@ -977,7 +977,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"requested peer mac is" MAC_ADDRESS_STR "requested peer mac is" MAC_ADDRESS_STR
"our own SAP BSSID. Do not blacklist or whitelist this BSSID", "our own SAP BSSID. Do not blacklist or whitelist this BSSID",
MAC_ADDR_ARRAY(peer_sta_mac)); QDF_MAC_ADDR_ARRAY(peer_sta_mac));
return QDF_STATUS_E_FAULT; return QDF_STATUS_E_FAULT;
} }
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
@@ -1007,7 +1007,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
"Peer mac " MAC_ADDRESS_STR "Peer mac " MAC_ADDRESS_STR
" found in white and black lists." " found in white and black lists."
"Initial lists passed incorrect. Cannot execute this command.", "Initial lists passed incorrect. Cannot execute this command.",
MAC_ADDR_ARRAY(peer_sta_mac)); QDF_MAC_ADDR_ARRAY(peer_sta_mac));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -1024,7 +1024,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
QDF_TRACE_LEVEL_ERROR, QDF_TRACE_LEVEL_ERROR,
"White list is already maxed out. Cannot accept " "White list is already maxed out. Cannot accept "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_sta_mac)); QDF_MAC_ADDR_ARRAY(peer_sta_mac));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
if (sta_white_list) { if (sta_white_list) {
@@ -1033,7 +1033,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
QDF_TRACE_LEVEL_WARN, QDF_TRACE_LEVEL_WARN,
"MAC address already present in white list " "MAC address already present in white list "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_sta_mac)); QDF_MAC_ADDR_ARRAY(peer_sta_mac));
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
if (sta_black_list) { if (sta_black_list) {
@@ -1083,7 +1083,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
QDF_TRACE_LEVEL_WARN, QDF_TRACE_LEVEL_WARN,
"MAC address to be deleted is not present in the white list " "MAC address to be deleted is not present in the white list "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_sta_mac)); QDF_MAC_ADDR_ARRAY(peer_sta_mac));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
} else { } else {
@@ -1104,7 +1104,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
QDF_TRACE_LEVEL_ERROR, QDF_TRACE_LEVEL_ERROR,
"Black list is already maxed out. Cannot accept " "Black list is already maxed out. Cannot accept "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_sta_mac)); QDF_MAC_ADDR_ARRAY(peer_sta_mac));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
if (sta_black_list) { if (sta_black_list) {
@@ -1113,7 +1113,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
QDF_TRACE_LEVEL_WARN, QDF_TRACE_LEVEL_WARN,
"MAC address already present in black list " "MAC address already present in black list "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_sta_mac)); QDF_MAC_ADDR_ARRAY(peer_sta_mac));
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
if (sta_white_list) { if (sta_white_list) {
@@ -1159,7 +1159,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx,
QDF_TRACE_LEVEL_WARN, QDF_TRACE_LEVEL_WARN,
"MAC address to be deleted is not present in the black list " "MAC address to be deleted is not present in the black list "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(peer_sta_mac)); QDF_MAC_ADDR_ARRAY(peer_sta_mac));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
} else { } else {
@@ -2364,7 +2364,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac,
FL("Delete STA with RC:%hu subtype:%hhu MAC::" FL("Delete STA with RC:%hu subtype:%hhu MAC::"
MAC_ADDRESS_STR), MAC_ADDRESS_STR),
params->reason_code, params->subtype, params->reason_code, params->subtype,
MAC_ADDR_ARRAY(params->peerMacAddr.bytes)); QDF_MAC_ADDR_ARRAY(params->peerMacAddr.bytes));
} }
QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context, QDF_STATUS wlansap_acs_chselect(struct sap_context *sap_context,

View File

@@ -11641,7 +11641,7 @@ int sme_send_he_om_ctrl_update(mac_handle_t mac_handle, uint8_t session_id)
omi_data.ul_mu_dis, omi_data.omi_in_vht, omi_data.omi_in_he); omi_data.ul_mu_dis, omi_data.omi_in_vht, omi_data.omi_in_he);
qdf_mem_copy(&param_val, &omi_data, sizeof(omi_data)); qdf_mem_copy(&param_val, &omi_data, sizeof(omi_data));
sme_debug("param val %08X, bssid:"MAC_ADDRESS_STR, param_val, sme_debug("param val %08X, bssid:"MAC_ADDRESS_STR, param_val,
MAC_ADDR_ARRAY(session->connectedProfile.bssid.bytes)); QDF_MAC_ADDR_ARRAY(session->connectedProfile.bssid.bytes));
status = wma_set_peer_param(wma_handle, status = wma_set_peer_param(wma_handle,
session->connectedProfile.bssid.bytes, session->connectedProfile.bssid.bytes,
WMI_PEER_PARAM_XMIT_OMI, WMI_PEER_PARAM_XMIT_OMI,
@@ -14469,7 +14469,7 @@ static bool sme_get_status_for_candidate(mac_handle_t mac_handle,
if ((bss_desc->rssi < mbo_cfg->mbo_candidate_rssi_thres) && if ((bss_desc->rssi < mbo_cfg->mbo_candidate_rssi_thres) &&
(conn_bss_desc->rssi > mbo_cfg->mbo_current_rssi_thres)) { (conn_bss_desc->rssi > mbo_cfg->mbo_current_rssi_thres)) {
sme_err("Candidate BSS "MAC_ADDRESS_STR" has LOW RSSI(%d), hence reject", sme_err("Candidate BSS "MAC_ADDRESS_STR" has LOW RSSI(%d), hence reject",
MAC_ADDR_ARRAY(bss_desc->bssId), bss_desc->rssi); QDF_MAC_ADDR_ARRAY(bss_desc->bssId), bss_desc->rssi);
info->status = QCA_STATUS_REJECT_LOW_RSSI; info->status = QCA_STATUS_REJECT_LOW_RSSI;
return true; return true;
} }
@@ -14487,7 +14487,7 @@ static bool sme_get_status_for_candidate(mac_handle_t mac_handle,
if ((conn_bss_desc->rssi > current_rssi_mcc_thres) && if ((conn_bss_desc->rssi > current_rssi_mcc_thres) &&
csr_is_mcc_channel(mac_ctx, bss_desc->channelId)) { csr_is_mcc_channel(mac_ctx, bss_desc->channelId)) {
sme_err("Candidate BSS "MAC_ADDRESS_STR" causes MCC, hence reject", sme_err("Candidate BSS "MAC_ADDRESS_STR" causes MCC, hence reject",
MAC_ADDR_ARRAY(bss_desc->bssId)); QDF_MAC_ADDR_ARRAY(bss_desc->bssId));
info->status = info->status =
QCA_STATUS_REJECT_INSUFFICIENT_QOS_CAPACITY; QCA_STATUS_REJECT_INSUFFICIENT_QOS_CAPACITY;
return true; return true;
@@ -14505,7 +14505,7 @@ static bool sme_get_status_for_candidate(mac_handle_t mac_handle,
is_bt_in_progress && is_bt_in_progress &&
(bss_desc->rssi < mbo_cfg->mbo_candidate_rssi_btc_thres)) { (bss_desc->rssi < mbo_cfg->mbo_candidate_rssi_btc_thres)) {
sme_err("Candidate BSS "MAC_ADDRESS_STR" causes BT coex, hence reject", sme_err("Candidate BSS "MAC_ADDRESS_STR" causes BT coex, hence reject",
MAC_ADDR_ARRAY(bss_desc->bssId)); QDF_MAC_ADDR_ARRAY(bss_desc->bssId));
info->status = info->status =
QCA_STATUS_REJECT_EXCESSIVE_DELAY_EXPECTED; QCA_STATUS_REJECT_EXCESSIVE_DELAY_EXPECTED;
return true; return true;
@@ -14522,7 +14522,7 @@ static bool sme_get_status_for_candidate(mac_handle_t mac_handle,
bss_desc->channelId))) { bss_desc->channelId))) {
sme_err("High interference expected if transitioned to BSS " sme_err("High interference expected if transitioned to BSS "
MAC_ADDRESS_STR" hence reject", MAC_ADDRESS_STR" hence reject",
MAC_ADDR_ARRAY(bss_desc->bssId)); QDF_MAC_ADDR_ARRAY(bss_desc->bssId));
info->status = info->status =
QCA_STATUS_REJECT_HIGH_INTERFERENCE; QCA_STATUS_REJECT_HIGH_INTERFERENCE;
return true; return true;
@@ -14574,7 +14574,7 @@ QDF_STATUS sme_get_bss_transition_status(mac_handle_t mac_handle,
res); res);
if (!QDF_IS_STATUS_SUCCESS(status)) { if (!QDF_IS_STATUS_SUCCESS(status)) {
sme_err("BSS "MAC_ADDRESS_STR" not present in scan list", sme_err("BSS "MAC_ADDRESS_STR" not present in scan list",
MAC_ADDR_ARRAY(info[i].bssid.bytes)); QDF_MAC_ADDR_ARRAY(info[i].bssid.bytes));
info[i].status = QCA_STATUS_REJECT_UNKNOWN; info[i].status = QCA_STATUS_REJECT_UNKNOWN;
continue; continue;
} }
@@ -14743,7 +14743,7 @@ QDF_STATUS sme_handle_sae_msg(mac_handle_t mac_handle,
sme_debug("SAE: sae_status %d session_id %d Peer: " sme_debug("SAE: sae_status %d session_id %d Peer: "
MAC_ADDRESS_STR, sae_msg->sae_status, MAC_ADDRESS_STR, sae_msg->sae_status,
sae_msg->session_id, sae_msg->session_id,
MAC_ADDR_ARRAY(sae_msg->peer_mac_addr)); QDF_MAC_ADDR_ARRAY(sae_msg->peer_mac_addr));
sch_msg.type = eWNI_SME_SEND_SAE_MSG; sch_msg.type = eWNI_SME_SEND_SAE_MSG;
sch_msg.bodyptr = sae_msg; sch_msg.bodyptr = sae_msg;

View File

@@ -276,7 +276,8 @@ QDF_STATUS sme_ft_send_update_key_ind(struct mac_context *mac, uint32_t session_
qdf_copy_macaddr(&msg->bssid, &ftkey_info->peerMac); qdf_copy_macaddr(&msg->bssid, &ftkey_info->peerMac);
msg->smeSessionId = session_id; msg->smeSessionId = session_id;
sme_debug("BSSID = " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(msg->bssid.bytes)); sme_debug("BSSID = " MAC_ADDRESS_STR,
QDF_MAC_ADDR_ARRAY(msg->bssid.bytes));
status = umac_send_mb_message_to_mac(msg); status = umac_send_mb_message_to_mac(msg);
return status; return status;

View File

@@ -173,7 +173,7 @@ static QDF_STATUS csr_sae_callback(struct mac_context *mac_ctx,
sme_debug("vdev_id %d "MAC_ADDRESS_STR"", sme_debug("vdev_id %d "MAC_ADDRESS_STR"",
sae_info->vdev_id, sae_info->vdev_id,
MAC_ADDR_ARRAY(sae_info->peer_mac_addr.bytes)); QDF_MAC_ADDR_ARRAY(sae_info->peer_mac_addr.bytes));
session_id = sae_info->vdev_id; session_id = sae_info->vdev_id;
if (session_id == WLAN_UMAC_VDEV_ID_MAX) if (session_id == WLAN_UMAC_VDEV_ID_MAX)
@@ -1976,7 +1976,7 @@ static void csr_send_ese_adjacent_ap_rep_ind(struct mac_context *mac,
roamTS2 = qdf_mc_timer_get_system_time(); roamTS2 = qdf_mc_timer_get_system_time();
roam_info->tsmRoamDelay = roamTS2 - pSession->roamTS1; roam_info->tsmRoamDelay = roamTS2 - pSession->roamTS1;
sme_debug("Bssid(" MAC_ADDRESS_STR ") Roaming Delay(%u ms)", sme_debug("Bssid(" MAC_ADDRESS_STR ") Roaming Delay(%u ms)",
MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes), QDF_MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes),
roam_info->tsmRoamDelay); roam_info->tsmRoamDelay);
pe_session = pe_find_session_by_bssid(mac, pe_session = pe_find_session_by_bssid(mac,
@@ -3644,7 +3644,7 @@ QDF_STATUS csr_roam_issue_disassociate(struct mac_context *mac, uint32_t session
} }
sme_debug("CSR Attempting to Disassociate Bssid=" MAC_ADDRESS_STR sme_debug("CSR Attempting to Disassociate Bssid=" MAC_ADDRESS_STR
" subState: %s reason: %d", MAC_ADDR_ARRAY(bssId.bytes), " subState: %s reason: %d", QDF_MAC_ADDR_ARRAY(bssId.bytes),
mac_trace_getcsr_roam_sub_state(NewSubstate), reasonCode); mac_trace_getcsr_roam_sub_state(NewSubstate), reasonCode);
csr_roam_substate_change(mac, NewSubstate, sessionId); csr_roam_substate_change(mac, NewSubstate, sessionId);
@@ -3770,7 +3770,7 @@ QDF_STATUS csr_roam_issue_deauth(struct mac_context *mac, uint32_t sessionId,
sizeof(struct qdf_mac_addr)); sizeof(struct qdf_mac_addr));
} }
sme_debug("CSR Attempting to Deauth Bssid= " MAC_ADDRESS_STR, sme_debug("CSR Attempting to Deauth Bssid= " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(bssId.bytes)); QDF_MAC_ADDR_ARRAY(bssId.bytes));
csr_roam_substate_change(mac, NewSubstate, sessionId); csr_roam_substate_change(mac, NewSubstate, sessionId);
status = status =
@@ -3781,7 +3781,7 @@ QDF_STATUS csr_roam_issue_deauth(struct mac_context *mac, uint32_t sessionId,
else { else {
sme_err("csr_send_mb_deauth_req_msg failed with status %d Session ID: %d" sme_err("csr_send_mb_deauth_req_msg failed with status %d Session ID: %d"
MAC_ADDRESS_STR, status, sessionId, MAC_ADDRESS_STR, status, sessionId,
MAC_ADDR_ARRAY(bssId.bytes)); QDF_MAC_ADDR_ARRAY(bssId.bytes));
} }
return status; return status;
@@ -7939,7 +7939,7 @@ static void csr_roam_print_candidate_aps(tScanResultHandle results)
bss_desc = GET_BASE_ADDR(entry, bss_desc = GET_BASE_ADDR(entry,
struct tag_csrscan_result, Link); struct tag_csrscan_result, Link);
sme_debug("BSSID" MAC_ADDRESS_STR "score is %d", sme_debug("BSSID" MAC_ADDRESS_STR "score is %d",
MAC_ADDR_ARRAY(bss_desc->Result.BssDescriptor.bssId), QDF_MAC_ADDR_ARRAY(bss_desc->Result.BssDescriptor.bssId),
bss_desc->bss_score); bss_desc->bss_score);
entry = csr_ll_next(&bss_list->List, entry, entry = csr_ll_next(&bss_list->List, entry,
@@ -8799,7 +8799,7 @@ static QDF_STATUS csr_roam_issue_join(struct mac_context *mac, uint32_t sessionI
QDF_STATUS status; QDF_STATUS status;
sme_debug("Attempting to Join Bssid= " MAC_ADDRESS_STR, sme_debug("Attempting to Join Bssid= " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pSirBssDesc->bssId)); QDF_MAC_ADDR_ARRAY(pSirBssDesc->bssId));
/* Set the roaming substate to 'join attempt'... */ /* Set the roaming substate to 'join attempt'... */
csr_roam_substate_change(mac, eCSR_ROAM_SUBSTATE_JOIN_REQ, sessionId); csr_roam_substate_change(mac, eCSR_ROAM_SUBSTATE_JOIN_REQ, sessionId);
@@ -9499,7 +9499,7 @@ void csr_handle_disassoc_ho(struct mac_context *mac, uint32_t session_id)
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
"LFR2DBG: preauthed bss_node->pBssDescription BSSID"\ "LFR2DBG: preauthed bss_node->pBssDescription BSSID"\
MAC_ADDRESS_STR",Ch:%d", MAC_ADDRESS_STR",Ch:%d",
MAC_ADDR_ARRAY(bss_node->pBssDescription->bssId), QDF_MAC_ADDR_ARRAY(bss_node->pBssDescription->bssId),
(int)bss_node->pBssDescription->channelId); (int)bss_node->pBssDescription->channelId);
status = policy_mgr_handle_conc_multiport(mac->psoc, session_id, status = policy_mgr_handle_conc_multiport(mac->psoc, session_id,
@@ -10878,7 +10878,7 @@ static QDF_STATUS csr_send_reset_ap_caps_changed(struct mac_context *mac,
qdf_copy_macaddr(&pMsg->bssId, bssId); qdf_copy_macaddr(&pMsg->bssId, bssId);
sme_debug( sme_debug(
"CSR reset caps change for Bssid= " MAC_ADDRESS_STR, "CSR reset caps change for Bssid= " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pMsg->bssId.bytes)); QDF_MAC_ADDR_ARRAY(pMsg->bssId.bytes));
status = umac_send_mb_message_to_mac(pMsg); status = umac_send_mb_message_to_mac(pMsg);
} else { } else {
sme_err("Memory allocation failed"); sme_err("Memory allocation failed");
@@ -11290,7 +11290,7 @@ csr_roam_chk_lnk_disassoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
&pDisassocInd->bssid, &sessionId); &pDisassocInd->bssid, &sessionId);
if (!QDF_IS_STATUS_SUCCESS(status)) { if (!QDF_IS_STATUS_SUCCESS(status)) {
sme_err("Session Id not found for BSSID "MAC_ADDRESS_STR, sme_err("Session Id not found for BSSID "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pDisassocInd->bssid.bytes)); QDF_MAC_ADDR_ARRAY(pDisassocInd->bssid.bytes));
qdf_mem_free(cmd); qdf_mem_free(cmd);
return; return;
} }
@@ -11302,7 +11302,7 @@ csr_roam_chk_lnk_disassoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
} }
sme_err("DISASSOCIATION from peer =" MAC_ADDRESS_STR "reason: %d status: %d session: %d", sme_err("DISASSOCIATION from peer =" MAC_ADDRESS_STR "reason: %d status: %d session: %d",
MAC_ADDR_ARRAY(pDisassocInd->peer_macaddr.bytes), QDF_MAC_ADDR_ARRAY(pDisassocInd->peer_macaddr.bytes),
pDisassocInd->reasonCode, pDisassocInd->reasonCode,
pDisassocInd->statusCode, sessionId); pDisassocInd->statusCode, sessionId);
/* /*
@@ -12135,7 +12135,7 @@ csr_roam_chk_lnk_set_ctx_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
"CSR: setkey command failed(err=%d) PeerMac " "CSR: setkey command failed(err=%d) PeerMac "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
pRsp->statusCode, pRsp->statusCode,
MAC_ADDR_ARRAY(pRsp->peer_macaddr.bytes)); QDF_MAC_ADDR_ARRAY(pRsp->peer_macaddr.bytes));
} }
/* keeping roam_id = 0 as nobody is using roam_id for set_key */ /* keeping roam_id = 0 as nobody is using roam_id for set_key */
csr_roam_call_callback(mac_ctx, sessionId, roam_info, csr_roam_call_callback(mac_ctx, sessionId, roam_info,
@@ -14767,7 +14767,7 @@ static void csr_update_sae_config(struct join_req *csr_join_req,
sme_debug("pmk_cached %d for BSSID=" MAC_ADDRESS_STR, sme_debug("pmk_cached %d for BSSID=" MAC_ADDRESS_STR,
csr_join_req->sae_pmk_cached, csr_join_req->sae_pmk_cached,
MAC_ADDR_ARRAY(csr_join_req->bssDescription.bssId)); QDF_MAC_ADDR_ARRAY(csr_join_req->bssDescription.bssId));
} }
#else #else
static void csr_update_sae_config(struct join_req *csr_join_req, static void csr_update_sae_config(struct join_req *csr_join_req,
@@ -15060,7 +15060,7 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
sizeof(tSirMacAddr)); sizeof(tSirMacAddr));
sme_info("Connecting to ssid:%.*s bssid: "MAC_ADDRESS_STR" rssi: %d channel: %d country_code: %c%c", sme_info("Connecting to ssid:%.*s bssid: "MAC_ADDRESS_STR" rssi: %d channel: %d country_code: %c%c",
csr_join_req->ssId.length, csr_join_req->ssId.ssId, csr_join_req->ssId.length, csr_join_req->ssId.ssId,
MAC_ADDR_ARRAY(pBssDescription->bssId), QDF_MAC_ADDR_ARRAY(pBssDescription->bssId),
pBssDescription->rssi, pBssDescription->channelId, pBssDescription->rssi, pBssDescription->channelId,
mac->scan.countryCodeCurrent[0], mac->scan.countryCodeCurrent[0],
mac->scan.countryCodeCurrent[1]); mac->scan.countryCodeCurrent[1]);
@@ -15933,9 +15933,9 @@ QDF_STATUS csr_send_chng_mcc_beacon_interval(struct mac_context *mac,
pMsg->length = len; pMsg->length = len;
qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr);
sme_debug( sme_debug("CSR Attempting to change BI for Bssid= "
"CSR Attempting to change BI for Bssid= " MAC_ADDRESS_STR,
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pMsg->bssid.bytes)); QDF_MAC_ADDR_ARRAY(pMsg->bssid.bytes));
pMsg->sessionId = sessionId; pMsg->sessionId = sessionId;
sme_debug("session %d BeaconInterval %d", sme_debug("session %d BeaconInterval %d",
sessionId, sessionId,
@@ -15977,7 +15977,8 @@ QDF_STATUS csr_set_ht2040_mode(struct mac_context *mac, uint32_t sessionId,
qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr);
sme_debug( sme_debug(
"CSR Attempting to set HT20/40 mode for Bssid= " "CSR Attempting to set HT20/40 mode for Bssid= "
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pMsg->bssid.bytes)); MAC_ADDRESS_STR,
QDF_MAC_ADDR_ARRAY(pMsg->bssid.bytes));
pMsg->sessionId = sessionId; pMsg->sessionId = sessionId;
sme_debug(" session %d HT20/40 mode %d", sme_debug(" session %d HT20/40 mode %d",
sessionId, cbMode); sessionId, cbMode);
@@ -16615,7 +16616,7 @@ QDF_STATUS csr_issue_add_sta_for_session_req(struct mac_context *mac,
sme_debug( sme_debug(
"Send WMA_ADD_STA_SELF_REQ for selfMac=" MAC_ADDRESS_STR, "Send WMA_ADD_STA_SELF_REQ for selfMac=" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(add_sta_self_req->self_mac_addr)); QDF_MAC_ADDR_ARRAY(add_sta_self_req->self_mac_addr));
status = scheduler_post_message(QDF_MODULE_ID_SME, status = scheduler_post_message(QDF_MODULE_ID_SME,
QDF_MODULE_ID_WMA, QDF_MODULE_ID_WMA,
QDF_MODULE_ID_WMA, &msg); QDF_MODULE_ID_WMA, &msg);
@@ -16650,7 +16651,7 @@ QDF_STATUS csr_roam_open_session(struct mac_context *mac_ctx,
if (QDF_IS_STATUS_SUCCESS(status)) { if (QDF_IS_STATUS_SUCCESS(status)) {
sme_err("Session %d exists with mac address " MAC_ADDRESS_STR, sme_err("Session %d exists with mac address " MAC_ADDRESS_STR,
existing_session_id, existing_session_id,
MAC_ADDR_ARRAY(session_param->self_mac_addr)); QDF_MAC_ADDR_ARRAY(session_param->self_mac_addr));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -17000,7 +17001,7 @@ static void csr_roam_link_up(struct mac_context *mac, struct qdf_mac_addr bssid)
*/ */
sme_debug("WLAN link UP with AP= " MAC_ADDRESS_STR, sme_debug("WLAN link UP with AP= " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(bssid.bytes)); QDF_MAC_ADDR_ARRAY(bssid.bytes));
/* Indicate the neighbor roal algorithm about the connect indication */ /* Indicate the neighbor roal algorithm about the connect indication */
csr_roam_get_session_id_from_bssid(mac, &bssid, csr_roam_get_session_id_from_bssid(mac, &bssid,
&sessionId); &sessionId);
@@ -19369,7 +19370,7 @@ csr_roam_offload_scan(struct mac_context *mac_ctx, uint8_t session_id,
for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) { for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
"Blacklist Bssid:"MAC_ADDRESS_STR")", "Blacklist Bssid:"MAC_ADDRESS_STR")",
MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i]. QDF_MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i].
bytes)); bytes));
} }
for (i = 0; i < roam_params_dst->num_ssid_allowed_list; i++) { for (i = 0; i < roam_params_dst->num_ssid_allowed_list; i++) {
@@ -19381,7 +19382,7 @@ csr_roam_offload_scan(struct mac_context *mac_ctx, uint8_t session_id,
for (i = 0; i < roam_params_dst->num_bssid_favored; i++) { for (i = 0; i < roam_params_dst->num_bssid_favored; i++) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
"Preferred Bssid:"MAC_ADDRESS_STR") score: %d", "Preferred Bssid:"MAC_ADDRESS_STR") score: %d",
MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i].bytes), QDF_MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i].bytes),
roam_params_dst->bssid_favored_factor[i]); roam_params_dst->bssid_favored_factor[i]);
} }

View File

@@ -481,7 +481,7 @@ static bool csr_scan_save_bss_description(struct mac_context *mac,
sme_debug( sme_debug(
"Set Aging Count = %d for BSS " MAC_ADDRESS_STR " ", "Set Aging Count = %d for BSS " MAC_ADDRESS_STR " ",
pCsrBssDescription->AgingCount, pCsrBssDescription->AgingCount,
MAC_ADDR_ARRAY(pCsrBssDescription->Result.BssDescriptor. QDF_MAC_ADDR_ARRAY(pCsrBssDescription->Result.BssDescriptor.
bssId)); bssId));
qdf_mem_copy(&pCsrBssDescription->Result.BssDescriptor, qdf_mem_copy(&pCsrBssDescription->Result.BssDescriptor,
pBSSDescription, cbBSSDesc); pBSSDescription, cbBSSDesc);
@@ -1789,9 +1789,9 @@ QDF_STATUS csr_scan_create_entry_in_scan_cache(struct mac_context *mac,
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
sme_debug("Current bssid::"MAC_ADDRESS_STR, sme_debug("Current bssid::"MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pSession->pConnectBssDesc->bssId)); QDF_MAC_ADDR_ARRAY(pSession->pConnectBssDesc->bssId));
sme_debug("My bssid::"MAC_ADDRESS_STR" channel %d", sme_debug("My bssid::"MAC_ADDRESS_STR" channel %d",
MAC_ADDR_ARRAY(bssid.bytes), channel); QDF_MAC_ADDR_ARRAY(bssid.bytes), channel);
size = pSession->pConnectBssDesc->length + size = pSession->pConnectBssDesc->length +
sizeof(pSession->pConnectBssDesc->length); sizeof(pSession->pConnectBssDesc->length);
@@ -1856,7 +1856,7 @@ csr_rso_save_ap_to_scan_cache(struct mac_context *mac,
(sizeof(tSirBssDescription) + length)); (sizeof(tSirBssDescription) + length));
sme_debug("LFR3:Add BSSID to scan cache" MAC_ADDRESS_STR, sme_debug("LFR3:Add BSSID to scan cache" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(scan_res_ptr->Result.BssDescriptor.bssId)); QDF_MAC_ADDR_ARRAY(scan_res_ptr->Result.BssDescriptor.bssId));
csr_scan_add_result(mac, scan_res_ptr); csr_scan_add_result(mac, scan_res_ptr);
csr_free_scan_result_entry(mac, scan_res_ptr); csr_free_scan_result_entry(mac, scan_res_ptr);
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;

View File

@@ -203,7 +203,7 @@ void csr_neighbor_roam_process_scan_results(struct mac_context *mac_ctx,
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
FL("Scan result: BSSID " MAC_ADDRESS_STR FL("Scan result: BSSID " MAC_ADDRESS_STR
" (Rssi %d, Ch:%d)"), " (Rssi %d, Ch:%d)"),
MAC_ADDR_ARRAY(descr->bssId), QDF_MAC_ADDR_ARRAY(descr->bssId),
(int)abs(descr->rssi), descr->channelId); (int)abs(descr->rssi), descr->channelId);
if (!qdf_mem_cmp(descr->bssId, if (!qdf_mem_cmp(descr->bssId,
@@ -283,14 +283,14 @@ void csr_neighbor_roam_process_scan_results(struct mac_context *mac_ctx,
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE(QDF_MODULE_ID_SME,
QDF_TRACE_LEVEL_DEBUG, QDF_TRACE_LEVEL_DEBUG,
"BSSID:" MAC_ADDRESS_STR "has no BW", "BSSID:" MAC_ADDRESS_STR "has no BW",
MAC_ADDR_ARRAY(descr->bssId)); QDF_MAC_ADDR_ARRAY(descr->bssId));
continue; continue;
} }
if (voadmitted && !qpresent) { if (voadmitted && !qpresent) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE(QDF_MODULE_ID_SME,
QDF_TRACE_LEVEL_DEBUG, QDF_TRACE_LEVEL_DEBUG,
"BSSID:" MAC_ADDRESS_STR "no LOAD IE", "BSSID:" MAC_ADDRESS_STR "no LOAD IE",
MAC_ADDR_ARRAY(descr->bssId)); QDF_MAC_ADDR_ARRAY(descr->bssId));
continue; continue;
} }
#endif /* FEATURE_WLAN_ESE */ #endif /* FEATURE_WLAN_ESE */
@@ -632,7 +632,7 @@ void csr_neighbor_roam_request_handoff(struct mac_context *mac_ctx,
} }
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR), FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(handoff_node.pBssDescription->bssId)); QDF_MAC_ADDR_ARRAY(handoff_node.pBssDescription->bssId));
roam_info = qdf_mem_malloc(sizeof(*roam_info)); roam_info = qdf_mem_malloc(sizeof(*roam_info));
if (!roam_info) if (!roam_info)

View File

@@ -818,7 +818,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(struct mac_context *mac,
FL("Disconn ind on session %d in state %d from bss :" FL("Disconn ind on session %d in state %d from bss :"
MAC_ADDRESS_STR), sessionId, MAC_ADDRESS_STR), sessionId,
pNeighborRoamInfo->neighborRoamState, pNeighborRoamInfo->neighborRoamState,
MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes)); QDF_MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes));
/* /*
* Free the current previous profile and move * Free the current previous profile and move
* the current profile to prev profile. * the current profile to prev profile.

View File

@@ -242,7 +242,7 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(struct mac_context *mac_ctx,
sme_debug("Preauth completed successfully after %d tries", sme_debug("Preauth completed successfully after %d tries",
neighbor_roam_info->FTRoamInfo.numPreAuthRetries); neighbor_roam_info->FTRoamInfo.numPreAuthRetries);
sme_debug("After Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d", sme_debug("After Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d",
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
preauth_rsp_node->pBssDescription->bssId), preauth_rsp_node->pBssDescription->bssId),
(int)preauth_rsp_node->pBssDescription->channelId); (int)preauth_rsp_node->pBssDescription->channelId);
@@ -375,7 +375,7 @@ static QDF_STATUS csr_neighbor_roam_add_preauth_fail(struct mac_context *mac_ctx
numMACAddress; numMACAddress;
sme_warn("Added BSSID " MAC_ADDRESS_STR " to Preauth failed list", sme_warn("Added BSSID " MAC_ADDRESS_STR " to Preauth failed list",
MAC_ADDR_ARRAY(bssid)); QDF_MAC_ADDR_ARRAY(bssid));
for (i = 0; for (i = 0;
i < neighbor_roam_info->FTRoamInfo.preAuthFailList.numMACAddress; i < neighbor_roam_info->FTRoamInfo.preAuthFailList.numMACAddress;
@@ -384,7 +384,7 @@ static QDF_STATUS csr_neighbor_roam_add_preauth_fail(struct mac_context *mac_ctx
neighbor_roam_info->FTRoamInfo.preAuthFailList.macAddress[i], neighbor_roam_info->FTRoamInfo.preAuthFailList.macAddress[i],
bssid, sizeof(tSirMacAddr))) { bssid, sizeof(tSirMacAddr))) {
sme_warn("BSSID "MAC_ADDRESS_STR" already fail list", sme_warn("BSSID "MAC_ADDRESS_STR" already fail list",
MAC_ADDR_ARRAY(bssid)); QDF_MAC_ADDR_ARRAY(bssid));
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
} }
@@ -430,7 +430,7 @@ bool csr_neighbor_roam_is_preauth_candidate(struct mac_context *mac,
preAuthFailList.macAddress[i], bssId, preAuthFailList.macAddress[i], bssId,
sizeof(tSirMacAddr))) { sizeof(tSirMacAddr))) {
sme_err("BSSID exists in fail list" MAC_ADDRESS_STR, sme_err("BSSID exists in fail list" MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(bssId)); QDF_MAC_ADDR_ARRAY(bssId));
return false; return false;
} }
} }
@@ -762,7 +762,7 @@ QDF_STATUS csr_neighbor_roam_issue_preauth_req(struct mac_context *mac_ctx,
eCsrPerformPreauth, true); eCsrPerformPreauth, true);
sme_debug("Before Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d", sme_debug("Before Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d",
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
neighbor_bss_node->pBssDescription->bssId), neighbor_bss_node->pBssDescription->bssId),
(int)neighbor_bss_node->pBssDescription->channelId); (int)neighbor_bss_node->pBssDescription->channelId);

View File

@@ -3694,8 +3694,8 @@ bool csr_lookup_pmkid_using_bssid(struct mac_context *mac,
for (i = 0; i < session->NumPmkidCache; i++) { for (i = 0; i < session->NumPmkidCache; i++) {
session_pmk = &session->PmkidCacheInfo[i]; session_pmk = &session->PmkidCacheInfo[i];
sme_debug("Matching BSSID: " MAC_ADDRESS_STR " to cached BSSID:" sme_debug("Matching BSSID: " MAC_ADDRESS_STR " to cached BSSID:"
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pmk_cache->BSSID.bytes), MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pmk_cache->BSSID.bytes),
MAC_ADDR_ARRAY(session_pmk->BSSID.bytes)); QDF_MAC_ADDR_ARRAY(session_pmk->BSSID.bytes));
if (qdf_is_macaddr_equal(&pmk_cache->BSSID, if (qdf_is_macaddr_equal(&pmk_cache->BSSID,
&session_pmk->BSSID)) { &session_pmk->BSSID)) {
/* match found */ /* match found */
@@ -4275,7 +4275,7 @@ static bool csr_lookup_bkid(struct mac_context *mac, uint32_t sessionId,
do { do {
for (Index = 0; Index < pSession->NumBkidCache; Index++) { for (Index = 0; Index < pSession->NumBkidCache; Index++) {
sme_debug("match BKID " MAC_ADDRESS_STR " to ", sme_debug("match BKID " MAC_ADDRESS_STR " to ",
MAC_ADDR_ARRAY(pBSSId)); QDF_MAC_ADDR_ARRAY(pBSSId));
if (!qdf_mem_cmp if (!qdf_mem_cmp
(pBSSId, pSession->BkidCacheInfo[Index].BSSID.bytes, (pBSSId, pSession->BkidCacheInfo[Index].BSSID.bytes,
sizeof(struct qdf_mac_addr))) { sizeof(struct qdf_mac_addr))) {

View File

@@ -211,7 +211,7 @@ sme_rrm_send_beacon_report_xmit_ind(struct mac_context *mac_ctx,
beacon_rep->pBssDescription[i]; beacon_rep->pBssDescription[i];
sme_debug("RRM Result Bssid = " MAC_ADDRESS_STR sme_debug("RRM Result Bssid = " MAC_ADDRESS_STR
" chan= %d, rssi = -%d", " chan= %d, rssi = -%d",
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
beacon_rep->pBssDescription[i]->bssId), beacon_rep->pBssDescription[i]->bssId),
beacon_rep->pBssDescription[i]->channelId, beacon_rep->pBssDescription[i]->channelId,
beacon_rep->pBssDescription[i]->rssi * (-1)); beacon_rep->pBssDescription[i]->rssi * (-1));
@@ -358,7 +358,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results(
bcn_report->bcnRepBssInfo[j].ieLen = out_ie_len; bcn_report->bcnRepBssInfo[j].ieLen = out_ie_len;
sme_debug("Bssid"MAC_ADDRESS_STR" Channel: %d Rssi: %d", sme_debug("Bssid"MAC_ADDRESS_STR" Channel: %d Rssi: %d",
MAC_ADDR_ARRAY(bss_desc->bssId), QDF_MAC_ADDR_ARRAY(bss_desc->bssId),
bss_desc->channelId, (-1) * bss_desc->rssi); bss_desc->channelId, (-1) * bss_desc->rssi);
bcn_report->numBss++; bcn_report->numBss++;
if (++j >= SIR_BCN_REPORT_MAX_BSS_DESC) if (++j >= SIR_BCN_REPORT_MAX_BSS_DESC)
@@ -766,7 +766,7 @@ static QDF_STATUS sme_rrm_issue_scan_req(struct mac_context *mac_ctx)
&sme_rrm_ctx->sessionBssId, &session_id); &sme_rrm_ctx->sessionBssId, &session_id);
if (status != QDF_STATUS_SUCCESS) { if (status != QDF_STATUS_SUCCESS) {
sme_err("sme session ID not found for bssid= "MAC_ADDRESS_STR, sme_err("sme session ID not found for bssid= "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(sme_rrm_ctx->sessionBssId.bytes)); QDF_MAC_ADDR_ARRAY(sme_rrm_ctx->sessionBssId.bytes));
status = QDF_STATUS_E_FAILURE; status = QDF_STATUS_E_FAILURE;
goto free_ch_lst; goto free_ch_lst;
} }
@@ -1340,7 +1340,7 @@ static QDF_STATUS sme_rrm_process_neighbor_report(struct mac_context *mac,
sme_debug("Received neighbor report with Neighbor BSSID: " sme_debug("Received neighbor report with Neighbor BSSID: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY( QDF_MAC_ADDR_ARRAY(
neighbor_rpt->sNeighborBssDescription[i].bssId)); neighbor_rpt->sNeighborBssDescription[i].bssId));
rrm_calculate_neighbor_ap_roam_score(mac, neighbor_rpt_desc); rrm_calculate_neighbor_ap_roam_score(mac, neighbor_rpt_desc);
@@ -1351,7 +1351,7 @@ static QDF_STATUS sme_rrm_process_neighbor_report(struct mac_context *mac,
} else { } else {
sme_err("Roam score of BSSID " MAC_ADDRESS_STR sme_err("Roam score of BSSID " MAC_ADDRESS_STR
" is 0, Ignoring..", " is 0, Ignoring..",
MAC_ADDR_ARRAY(neighbor_rpt-> QDF_MAC_ADDR_ARRAY(neighbor_rpt->
sNeighborBssDescription[i]. sNeighborBssDescription[i].
bssId)); bssId));

View File

@@ -2203,7 +2203,7 @@ int wma_ibss_peer_info_event_handler(void *handle, uint8_t *data,
pSmeRsp->txRate = peer_info->data_rate; pSmeRsp->txRate = peer_info->data_rate;
WMA_LOGE("peer " MAC_ADDRESS_STR "rssi %d txRate %d", WMA_LOGE("peer " MAC_ADDRESS_STR "rssi %d txRate %d",
MAC_ADDR_ARRAY(peer_mac), QDF_MAC_ADDR_ARRAY(peer_mac),
pSmeRsp->rssi, pSmeRsp->txRate); pSmeRsp->rssi, pSmeRsp->txRate);
peer_info++; peer_info++;
@@ -3311,10 +3311,10 @@ uint8_t wma_rx_invalid_peer_ind(uint8_t vdev_id, void *wh)
WMA_LOGD("%s: vdev_id %d", __func__, vdev_id); WMA_LOGD("%s: vdev_id %d", __func__, vdev_id);
WMA_LOGD("%s: RA:" MAC_ADDRESS_STR, WMA_LOGD("%s: RA:" MAC_ADDRESS_STR,
__func__, __func__,
MAC_ADDR_ARRAY(rx_inv_msg->ra)); QDF_MAC_ADDR_ARRAY(rx_inv_msg->ra));
WMA_LOGD("%s: TA:" MAC_ADDRESS_STR, WMA_LOGD("%s: TA:" MAC_ADDRESS_STR,
__func__, __func__,
MAC_ADDR_ARRAY(rx_inv_msg->ta)); QDF_MAC_ADDR_ARRAY(rx_inv_msg->ta));
wma_send_msg(wma, SIR_LIM_RX_INVALID_PEER, (void *)rx_inv_msg, 0); wma_send_msg(wma, SIR_LIM_RX_INVALID_PEER, (void *)rx_inv_msg, 0);

View File

@@ -4483,8 +4483,8 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss)
vdev = wma_find_vdev_by_addr(wma, add_bss->bssId, &vdev_id); vdev = wma_find_vdev_by_addr(wma, add_bss->bssId, &vdev_id);
if (!vdev) { if (!vdev) {
WMA_LOGE("%s: Failed to get vdev handle:"MAC_ADDRESS_STR, wma_err("Failed to get vdev handle:"MAC_ADDRESS_STR,
__func__, MAC_ADDR_ARRAY(add_bss->bssId)); QDF_MAC_ADDR_ARRAY(add_bss->bssId));
goto send_fail_resp; goto send_fail_resp;
} }

View File

@@ -597,11 +597,11 @@ QDF_STATUS wma_process_dhcp_ind(WMA_HANDLE handle,
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
WMA_LOGD("%s: WMA --> WMI_PEER_SET_PARAM triggered by DHCP, msgType=%s, device_mode=%d, macAddr=" MAC_ADDRESS_STR, wma_debug("WMA --> WMI_PEER_SET_PARAM triggered by DHCP, msgType=%s, device_mode=%d, macAddr=" MAC_ADDRESS_STR,
__func__, ta_dhcp_ind->msgType == WMA_DHCP_START_IND ? ta_dhcp_ind->msgType == WMA_DHCP_START_IND ?
"WMA_DHCP_START_IND" : "WMA_DHCP_STOP_IND", "WMA_DHCP_START_IND" : "WMA_DHCP_STOP_IND",
ta_dhcp_ind->device_mode, ta_dhcp_ind->device_mode,
MAC_ADDR_ARRAY(ta_dhcp_ind->peerMacAddr.bytes)); QDF_MAC_ADDR_ARRAY(ta_dhcp_ind->peerMacAddr.bytes));
/* fill in values */ /* fill in values */
peer_set_param_fp.vdev_id = vdev_id; peer_set_param_fp.vdev_id = vdev_id;
@@ -2323,8 +2323,8 @@ static void wma_wow_parse_data_pkt(t_wma_handle *wma,
src_mac = data + QDF_NBUF_SRC_MAC_OFFSET; src_mac = data + QDF_NBUF_SRC_MAC_OFFSET;
dest_mac = data + QDF_NBUF_DEST_MAC_OFFSET; dest_mac = data + QDF_NBUF_DEST_MAC_OFFSET;
WMA_LOGI("Src_mac: " MAC_ADDRESS_STR ", Dst_mac: " MAC_ADDRESS_STR, wma_info("Src_mac: " MAC_ADDRESS_STR ", Dst_mac: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(src_mac), MAC_ADDR_ARRAY(dest_mac)); QDF_MAC_ADDR_ARRAY(src_mac), QDF_MAC_ADDR_ARRAY(dest_mac));
wma_wow_inc_wake_lock_stats_by_dst_addr(wma, vdev_id, dest_mac); wma_wow_inc_wake_lock_stats_by_dst_addr(wma, vdev_id, dest_mac);
@@ -2414,9 +2414,9 @@ static void wma_wow_dump_mgmt_buffer(uint8_t *wow_packet_buffer,
uint8_t to_from_ds, frag_num; uint8_t to_from_ds, frag_num;
uint32_t seq_num; uint32_t seq_num;
WMA_LOGE("RA: " MAC_ADDRESS_STR " TA: " MAC_ADDRESS_STR, wma_err("RA: " MAC_ADDRESS_STR " TA: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wh->i_addr1), QDF_MAC_ADDR_ARRAY(wh->i_addr1),
MAC_ADDR_ARRAY(wh->i_addr2)); QDF_MAC_ADDR_ARRAY(wh->i_addr2));
WMA_LOGE("TO_DS: %u, FROM_DS: %u", WMA_LOGE("TO_DS: %u, FROM_DS: %u",
wh->i_fc[1] & IEEE80211_FC1_DIR_TODS, wh->i_fc[1] & IEEE80211_FC1_DIR_TODS,
@@ -2426,23 +2426,23 @@ static void wma_wow_dump_mgmt_buffer(uint8_t *wow_packet_buffer,
switch (to_from_ds) { switch (to_from_ds) {
case IEEE80211_FC1_DIR_NODS: case IEEE80211_FC1_DIR_NODS:
WMA_LOGE("BSSID: " MAC_ADDRESS_STR, wma_err("BSSID: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wh->i_addr3)); QDF_MAC_ADDR_ARRAY(wh->i_addr3));
break; break;
case IEEE80211_FC1_DIR_TODS: case IEEE80211_FC1_DIR_TODS:
WMA_LOGE("DA: " MAC_ADDRESS_STR, wma_err("DA: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wh->i_addr3)); QDF_MAC_ADDR_ARRAY(wh->i_addr3));
break; break;
case IEEE80211_FC1_DIR_FROMDS: case IEEE80211_FC1_DIR_FROMDS:
WMA_LOGE("SA: " MAC_ADDRESS_STR, wma_err("SA: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wh->i_addr3)); QDF_MAC_ADDR_ARRAY(wh->i_addr3));
break; break;
case IEEE80211_FC1_DIR_DSTODS: case IEEE80211_FC1_DIR_DSTODS:
if (buf_len >= sizeof(struct ieee80211_frame_addr4)) if (buf_len >= sizeof(struct ieee80211_frame_addr4))
WMA_LOGE("DA: " MAC_ADDRESS_STR " SA: " wma_err("DA: " MAC_ADDRESS_STR " SA: "
MAC_ADDRESS_STR, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wh->i_addr3), QDF_MAC_ADDR_ARRAY(wh->i_addr3),
MAC_ADDR_ARRAY(wh->i_addr4)); QDF_MAC_ADDR_ARRAY(wh->i_addr4));
break; break;
} }
@@ -4079,9 +4079,9 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle,
restore_last_peer = cdp_peer_is_vdev_restore_last_peer( restore_last_peer = cdp_peer_is_vdev_restore_last_peer(
soc, peer); soc, peer);
WMA_LOGD("%s: calling wma_remove_peer for peer " MAC_ADDRESS_STR wma_debug("calling wma_remove_peer for peer " MAC_ADDRESS_STR
" vdevId: %d", __func__, " vdevId: %d",
MAC_ADDR_ARRAY(peer_mac_addr), QDF_MAC_ADDR_ARRAY(peer_mac_addr),
peer_state->vdev_id); peer_state->vdev_id);
qdf_status = wma_remove_peer(wma_handle, peer_mac_addr, qdf_status = wma_remove_peer(wma_handle, peer_mac_addr,
peer_state->vdev_id, peer, false); peer_state->vdev_id, peer, false);
@@ -5472,7 +5472,7 @@ int wma_pdev_div_info_evt_handler(void *handle, u_int8_t *event_buf,
qdf_mem_zero(&chain_rssi_result, sizeof(chain_rssi_result)); qdf_mem_zero(&chain_rssi_result, sizeof(chain_rssi_result));
WMI_MAC_ADDR_TO_CHAR_ARRAY(&event->macaddr, macaddr); WMI_MAC_ADDR_TO_CHAR_ARRAY(&event->macaddr, macaddr);
WMA_LOGD(FL("macaddr: " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(macaddr)); wma_debug("macaddr: " MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(macaddr));
WMA_LOGD(FL("num_chains_valid: %d"), event->num_chains_valid); WMA_LOGD(FL("num_chains_valid: %d"), event->num_chains_valid);
chain_rssi_result.num_chains_valid = event->num_chains_valid; chain_rssi_result.num_chains_valid = event->num_chains_valid;

View File

@@ -641,8 +641,8 @@ static void wma_process_send_addba_req(tp_wma_handle wma_handle,
if (QDF_STATUS_SUCCESS != status) { if (QDF_STATUS_SUCCESS != status) {
WMA_LOGE(FL("Failed to process WMA_SEND_ADDBA_REQ")); WMA_LOGE(FL("Failed to process WMA_SEND_ADDBA_REQ"));
} }
WMA_LOGD(FL("sent ADDBA req to" MAC_ADDRESS_STR "tid %d buff_size %d"), wma_debug("sent ADDBA req to" MAC_ADDRESS_STR "tid %d buff_size %d",
MAC_ADDR_ARRAY(send_addba->mac_addr), QDF_MAC_ADDR_ARRAY(send_addba->mac_addr),
send_addba->param.tidno, send_addba->param.tidno,
send_addba->param.buffersize); send_addba->param.buffersize);
@@ -3838,8 +3838,8 @@ static int wma_set_base_macaddr_indicate(tp_wma_handle wma_handle,
(uint8_t *)customAddr); (uint8_t *)customAddr);
if (err) if (err)
return -EIO; return -EIO;
WMA_LOGD("Base MAC Addr: " MAC_ADDRESS_STR, wma_debug("Base MAC Addr: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY((*customAddr))); QDF_MAC_ADDR_ARRAY((*customAddr)));
return 0; return 0;
} }

View File

@@ -3992,8 +3992,9 @@ int wma_process_rmf_frame(tp_wma_handle wma_handle,
rx_pkt->pkt_meta.mpdu_data_ptr = rx_pkt->pkt_meta.mpdu_data_ptr =
rx_pkt->pkt_meta.mpdu_hdr_ptr + rx_pkt->pkt_meta.mpdu_hdr_ptr +
rx_pkt->pkt_meta.mpdu_hdr_len; rx_pkt->pkt_meta.mpdu_hdr_len;
WMA_LOGD(FL("BSSID: "MAC_ADDRESS_STR" tsf_delta: %u"), wma_debug("BSSID: "MAC_ADDRESS_STR" tsf_delta: %u",
MAC_ADDR_ARRAY(wh->i_addr3), rx_pkt->pkt_meta.tsf_delta); QDF_MAC_ADDR_ARRAY(wh->i_addr3),
rx_pkt->pkt_meta.tsf_delta);
} else { } else {
if (QDF_IS_ADDR_BROADCAST(wh->i_addr1) || if (QDF_IS_ADDR_BROADCAST(wh->i_addr1) ||
IEEE80211_IS_MULTICAST(wh->i_addr1)) { IEEE80211_IS_MULTICAST(wh->i_addr1)) {
@@ -4176,9 +4177,9 @@ int wma_form_rx_packet(qdf_nbuf_t buf,
* If the mpdu_data_len is greater than Max (2k), drop the frame * If the mpdu_data_len is greater than Max (2k), drop the frame
*/ */
if (rx_pkt->pkt_meta.mpdu_data_len > WMA_MAX_MGMT_MPDU_LEN) { if (rx_pkt->pkt_meta.mpdu_data_len > WMA_MAX_MGMT_MPDU_LEN) {
WMA_LOGE("Data Len %d greater than max, dropping frame from "MAC_ADDRESS_STR, wma_err("Data Len %d greater than max, dropping frame from "MAC_ADDRESS_STR,
rx_pkt->pkt_meta.mpdu_data_len, rx_pkt->pkt_meta.mpdu_data_len,
MAC_ADDR_ARRAY(wh->i_addr3)); QDF_MAC_ADDR_ARRAY(wh->i_addr3));
qdf_nbuf_free(buf); qdf_nbuf_free(buf);
qdf_mem_free(rx_pkt); qdf_mem_free(rx_pkt);
return -EINVAL; return -EINVAL;
@@ -4225,8 +4226,8 @@ int wma_form_rx_packet(qdf_nbuf_t buf,
if (mgmt_rx_params->buf_len <= if (mgmt_rx_params->buf_len <=
(sizeof(struct ieee80211_frame) + (sizeof(struct ieee80211_frame) +
offsetof(struct wlan_bcn_frame, ie))) { offsetof(struct wlan_bcn_frame, ie))) {
WMA_LOGD("Dropping frame from "MAC_ADDRESS_STR, wma_debug("Dropping frame from "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wh->i_addr3)); QDF_MAC_ADDR_ARRAY(wh->i_addr3));
cds_pkt_return_packet(rx_pkt); cds_pkt_return_packet(rx_pkt);
return -EINVAL; return -EINVAL;
} }

View File

@@ -161,8 +161,8 @@ void wma_add_sta_ndi_mode(tp_wma_handle wma, tpAddStaParams add_sta)
} }
iface = &wma->interfaces[cdp_get_vdev_id(soc, vdev)]; iface = &wma->interfaces[cdp_get_vdev_id(soc, vdev)];
WMA_LOGD(FL("vdev: %d, peer_mac_addr: "MAC_ADDRESS_STR), wma_debug("vdev: %d, peer_mac_addr: "MAC_ADDRESS_STR,
add_sta->smesessionId, MAC_ADDR_ARRAY(add_sta->staMac)); add_sta->smesessionId, QDF_MAC_ADDR_ARRAY(add_sta->staMac));
peer = cdp_peer_find_by_addr_and_vdev(soc, peer = cdp_peer_find_by_addr_and_vdev(soc,
pdev, vdev, pdev, vdev,