qcacld-3.0: fix build failures caused by QDF_MAC_ADDR_REF

Build failed once WLAN_TRACE_HIDE_MAC_ADDR is enabled,
due to 'error: type mismatch in conditional expression'.

To fix it, correct the parameter for QDF_MAC_ADDR_REF.

Change-Id: Ifd89b02ab5fb2e3b59291c303ad93b691616dc57
CRs-Fixed: 3308193
这个提交包含在:
Yu Wang
2022-10-08 20:23:56 -07:00
提交者 Madan Koyyalamudi
父节点 4230e9d4ef
当前提交 0e8ac06ee6
修改 7 个文件,包含 41 行新增41 行删除

查看文件

@@ -852,7 +852,7 @@ dp_peer_obj_create_notification(struct wlan_objmgr_peer *peer, void *arg)
sta_info->dhcp_nego_status = DHCP_NEGO_STOP;
dp_info("sta info created mac:" QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(&sta_info->sta_mac));
QDF_MAC_ADDR_REF(sta_info->sta_mac.bytes));
return status;
}
@@ -903,7 +903,7 @@ dp_vdev_obj_create_notification(struct wlan_objmgr_vdev *vdev, void *arg)
dev = dp_ctx->dp_ops.dp_get_netdev_by_vdev_mac(mac_addr);
if (!dev) {
dp_err("Failed to get intf mac:" QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(mac_addr));
QDF_MAC_ADDR_REF(mac_addr->bytes));
return QDF_STATUS_E_INVAL;
}

查看文件

@@ -51,13 +51,14 @@ void ucfg_dp_update_inf_mac(struct wlan_objmgr_psoc *psoc,
dp_intf = dp_get_intf_by_macaddr(dp_ctx, cur_mac);
if (!dp_intf) {
dp_err("DP interface not found addr:" QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(cur_mac));
QDF_MAC_ADDR_REF(cur_mac->bytes));
QDF_BUG(0);
return;
}
dp_info("MAC update from " QDF_MAC_ADDR_FMT " to " QDF_MAC_ADDR_FMT "",
QDF_MAC_ADDR_REF(cur_mac), QDF_MAC_ADDR_REF(new_mac));
QDF_MAC_ADDR_REF(cur_mac->bytes),
QDF_MAC_ADDR_REF(new_mac->bytes));
qdf_copy_macaddr(&dp_intf->mac_addr, new_mac);
}
@@ -73,12 +74,12 @@ ucfg_dp_create_intf(struct wlan_objmgr_psoc *psoc,
dp_ctx = dp_get_context();
dp_info("DP interface create addr:" QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(intf_addr));
QDF_MAC_ADDR_REF(intf_addr->bytes));
dp_intf = __qdf_mem_malloc(sizeof(*dp_intf), __func__, __LINE__);
if (!dp_intf) {
dp_err("DP intf memory alloc failed addr:" QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(intf_addr));
QDF_MAC_ADDR_REF(intf_addr->bytes));
return QDF_STATUS_E_FAILURE;
}
@@ -112,12 +113,12 @@ ucfg_dp_destroy_intf(struct wlan_objmgr_psoc *psoc,
dp_ctx = dp_get_context();
dp_info("DP interface destroy addr:" QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(intf_addr));
QDF_MAC_ADDR_REF(intf_addr->bytes));
dp_intf = dp_get_intf_by_macaddr(dp_ctx, intf_addr);
if (!dp_intf) {
dp_err("DP interface not found addr:" QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(intf_addr));
QDF_MAC_ADDR_REF(intf_addr->bytes));
return QDF_STATUS_E_FAILURE;
}
@@ -603,7 +604,7 @@ void ucfg_dp_update_dhcp_state_on_disassoc(struct wlan_objmgr_vdev *vdev,
WLAN_DP_ID);
if (!peer) {
dp_err("Peer object not found mac:" QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(mac_addr));
QDF_MAC_ADDR_REF(mac_addr->bytes));
return;
}