samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: fix build failures caused by QDF_MAC_ADDR_REF

Browse Source 
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
This commit is contained in:
Yu Wang
2022-10-08 20:23:56 -07:00
committed by Madan Koyyalamudi
parent 4230e9d4ef
commit 0e8ac06ee6
7 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/dp/core/src/wlan_dp_main.c
View File

@@ -852,7 +852,7 @@ dp_peer_obj_create_notification(struct wlan_objmgr_peer *peer, void *arg)
sta_info->dhcp_nego_status = DHCP_NEGO_STOP; sta_info->dhcp_nego_status = DHCP_NEGO_STOP;
dp_info("sta info created mac:" QDF_MAC_ADDR_FMT, 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; 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); dev = dp_ctx->dp_ops.dp_get_netdev_by_vdev_mac(mac_addr);
if (!dev) { if (!dev) {
dp_err("Failed to get intf mac:" QDF_MAC_ADDR_FMT, 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; return QDF_STATUS_E_INVAL;
} }

15
components/dp/dispatcher/src/wlan_dp_ucfg_api.c
View File

@@ -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); dp_intf = dp_get_intf_by_macaddr(dp_ctx, cur_mac);
if (!dp_intf) { if (!dp_intf) {
dp_err("DP interface not found addr:" QDF_MAC_ADDR_FMT, 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); QDF_BUG(0);
return; return;
} }
dp_info("MAC update from " QDF_MAC_ADDR_FMT " to " QDF_MAC_ADDR_FMT "", 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); 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_ctx = dp_get_context();
dp_info("DP interface create addr:" QDF_MAC_ADDR_FMT, 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__); dp_intf = __qdf_mem_malloc(sizeof(*dp_intf), __func__, __LINE__);
if (!dp_intf) { if (!dp_intf) {
dp_err("DP intf memory alloc failed addr:" QDF_MAC_ADDR_FMT, 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; return QDF_STATUS_E_FAILURE;
} }
@@ -112,12 +113,12 @@ ucfg_dp_destroy_intf(struct wlan_objmgr_psoc *psoc,
dp_ctx = dp_get_context(); dp_ctx = dp_get_context();
dp_info("DP interface destroy addr:" QDF_MAC_ADDR_FMT, 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); dp_intf = dp_get_intf_by_macaddr(dp_ctx, intf_addr);
if (!dp_intf) { if (!dp_intf) {
dp_err("DP interface not found addr:" QDF_MAC_ADDR_FMT, 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; 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); WLAN_DP_ID);
if (!peer) { if (!peer) {
dp_err("Peer object not found mac:" QDF_MAC_ADDR_FMT, 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; return;
} }

26
components/mlme/core/src/wlan_mlme_twt_api.c
View File

@@ -40,7 +40,7 @@ bool mlme_is_max_twt_sessions_reached(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return true; return true;
} }
@@ -81,7 +81,7 @@ bool mlme_is_twt_setup_in_progress(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return false; return false;
} }
@@ -121,7 +121,7 @@ void mlme_add_twt_session(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return; return;
} }
@@ -157,7 +157,7 @@ void mlme_set_twt_setup_done(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return; return;
} }
@@ -193,7 +193,7 @@ QDF_STATUS mlme_init_twt_context(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_debug("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_debug("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -309,7 +309,7 @@ bool mlme_is_twt_setup_done(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return false; return false;
} }
@@ -375,7 +375,7 @@ void mlme_set_twt_session_state(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return; return;
} }
@@ -411,7 +411,7 @@ mlme_get_twt_session_state(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return WLAN_TWT_SETUP_STATE_NOT_ESTABLISHED; return WLAN_TWT_SETUP_STATE_NOT_ESTABLISHED;
} }
@@ -446,7 +446,7 @@ uint8_t mlme_get_twt_peer_capabilities(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return false; return false;
} }
@@ -472,7 +472,7 @@ void mlme_set_twt_peer_capabilities(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_debug("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_debug("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return; return;
} }
@@ -681,7 +681,7 @@ bool mlme_sap_twt_peer_is_cmd_in_progress(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return false; return false;
} }
@@ -731,7 +731,7 @@ QDF_STATUS mlme_set_twt_command_in_progress(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -801,7 +801,7 @@ bool mlme_twt_is_command_in_progress(struct wlan_objmgr_psoc *psoc,
WLAN_MLME_NB_ID); WLAN_MLME_NB_ID);
if (!peer) { if (!peer) {
mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT, mlme_legacy_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return false; return false;
} }

26
components/umac/twt/core/src/wlan_twt_main.c
View File

@@ -51,7 +51,7 @@ wlan_twt_add_session(struct wlan_objmgr_psoc *psoc,
WLAN_TWT_ID); WLAN_TWT_ID);
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -93,7 +93,7 @@ wlan_twt_set_command_in_progress(struct wlan_objmgr_psoc *psoc,
WLAN_TWT_ID); WLAN_TWT_ID);
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -134,7 +134,7 @@ wlan_twt_init_context(struct wlan_objmgr_psoc *psoc,
WLAN_TWT_ID); WLAN_TWT_ID);
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -431,7 +431,7 @@ wlan_twt_sap_peer_is_cmd_in_progress(struct wlan_objmgr_psoc *psoc,
WLAN_TWT_ID); WLAN_TWT_ID);
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return false; return false;
} }
@@ -869,7 +869,7 @@ bool wlan_twt_is_setup_done(struct wlan_objmgr_psoc *psoc,
WLAN_TWT_ID); WLAN_TWT_ID);
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return false; return false;
} }
@@ -911,7 +911,7 @@ bool wlan_twt_is_max_sessions_reached(struct wlan_objmgr_psoc *psoc,
WLAN_TWT_ID); WLAN_TWT_ID);
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return true; return true;
} }
@@ -955,7 +955,7 @@ bool wlan_twt_is_setup_in_progress(struct wlan_objmgr_psoc *psoc,
WLAN_TWT_ID); WLAN_TWT_ID);
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return false; return false;
} }
@@ -1013,7 +1013,7 @@ wlan_twt_set_ack_context(struct wlan_objmgr_psoc *psoc,
WLAN_TWT_ID); WLAN_TWT_ID);
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -1069,7 +1069,7 @@ wlan_twt_get_ack_context(struct wlan_objmgr_psoc *psoc,
WLAN_TWT_ID); WLAN_TWT_ID);
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
goto err; goto err;
} }
@@ -1120,7 +1120,7 @@ bool wlan_twt_is_command_in_progress(struct wlan_objmgr_psoc *psoc,
WLAN_TWT_ID); WLAN_TWT_ID);
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return false; return false;
} }
@@ -1587,7 +1587,7 @@ wlan_twt_set_setup_done(struct wlan_objmgr_psoc *psoc,
WLAN_TWT_ID); WLAN_TWT_ID);
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return; return;
} }
@@ -1637,7 +1637,7 @@ wlan_twt_set_session_state(struct wlan_objmgr_psoc *psoc,
WLAN_TWT_ID); WLAN_TWT_ID);
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return; return;
} }
@@ -1676,7 +1676,7 @@ wlan_twt_get_session_state(struct wlan_objmgr_psoc *psoc,
if (!peer) { if (!peer) {
twt_err("Peer object not found "QDF_MAC_ADDR_FMT, twt_err("Peer object not found "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac)); QDF_MAC_ADDR_REF(peer_mac->bytes));
return WLAN_TWT_SETUP_STATE_NOT_ESTABLISHED; return WLAN_TWT_SETUP_STATE_NOT_ESTABLISHED;
} }

4
core/hdd/src/wlan_hdd_main.c
View File

@@ -4881,7 +4881,7 @@ hdd_get_netdev_by_vdev_mac(struct qdf_mac_addr *mac_addr)
adapter = hdd_get_adapter_by_macaddr(hdd_ctx, mac_addr->bytes); adapter = hdd_get_adapter_by_macaddr(hdd_ctx, mac_addr->bytes);
if (!adapter) { if (!adapter) {
hdd_err("Adapter not foud for MAC " QDF_MAC_ADDR_FMT "", hdd_err("Adapter not foud for MAC " QDF_MAC_ADDR_FMT "",
QDF_MAC_ADDR_REF(mac_addr)); QDF_MAC_ADDR_REF(mac_addr->bytes));
return NULL; return NULL;
} }
@@ -4915,7 +4915,7 @@ hdd_get_netdev_by_vdev_mac(struct qdf_mac_addr *mac_addr)
adapter = hdd_get_adapter_by_macaddr(hdd_ctx, mac_addr->bytes); adapter = hdd_get_adapter_by_macaddr(hdd_ctx, mac_addr->bytes);
if (!adapter) { if (!adapter) {
hdd_err("Adapter not foud for MAC " QDF_MAC_ADDR_FMT "", hdd_err("Adapter not foud for MAC " QDF_MAC_ADDR_FMT "",
QDF_MAC_ADDR_REF(mac_addr)); QDF_MAC_ADDR_REF(mac_addr->bytes));
return NULL; return NULL;
} }

2
core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
View File

@@ -2768,8 +2768,6 @@ lim_process_switch_channel_join_mlo(struct pe_session *session_entry,
struct element_info assoc_rsp; struct element_info assoc_rsp;
struct qdf_mac_addr sta_link_addr; struct qdf_mac_addr sta_link_addr;
pe_err("sta_link_addr" QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(&sta_link_addr));
assoc_rsp.len = 0; assoc_rsp.len = 0;
mlo_get_assoc_rsp(session_entry->vdev, &assoc_rsp); mlo_get_assoc_rsp(session_entry->vdev, &assoc_rsp);

5
core/wma/src/wma_pasn_peer_api.c
View File

@@ -49,13 +49,14 @@ wma_pasn_peer_remove(struct wlan_objmgr_psoc *psoc,
if (!wma_objmgr_peer_exist(wma, peer_addr->bytes, &peer_vdev_id)) { if (!wma_objmgr_peer_exist(wma, peer_addr->bytes, &peer_vdev_id)) {
wma_err("peer doesn't exist peer_addr " QDF_MAC_ADDR_FMT " vdevid %d", wma_err("peer doesn't exist peer_addr " QDF_MAC_ADDR_FMT " vdevid %d",
QDF_MAC_ADDR_REF(peer_addr), vdev_id); QDF_MAC_ADDR_REF(peer_addr->bytes), vdev_id);
return QDF_STATUS_E_INVAL; return QDF_STATUS_E_INVAL;
} }
if (peer_vdev_id != vdev_id) { if (peer_vdev_id != vdev_id) {
wma_err("peer " QDF_MAC_ADDR_FMT " is on vdev id %d but delete req on vdevid %d", wma_err("peer " QDF_MAC_ADDR_FMT " is on vdev id %d but delete req on vdevid %d",
QDF_MAC_ADDR_REF(peer_addr), peer_vdev_id, vdev_id); QDF_MAC_ADDR_REF(peer_addr->bytes),
peer_vdev_id, vdev_id);
return QDF_STATUS_E_INVAL; return QDF_STATUS_E_INVAL;
} }