diff --git a/target_if/init_deinit/src/init_event_handler.c b/target_if/init_deinit/src/init_event_handler.c index 9f7b3ce285..a4b9df1e8c 100644 --- a/target_if/init_deinit/src/init_event_handler.c +++ b/target_if/init_deinit/src/init_event_handler.c @@ -305,7 +305,7 @@ static int init_deinit_ready_event_handler(ol_scn_t scn_handle, struct target_psoc_info *tgt_hdl; void *wmi_handle; struct wmi_host_fw_abi_ver fw_ver; - uint8_t myaddr[WLAN_MACADDR_LEN]; + uint8_t myaddr[QDF_MAC_ADDR_SIZE]; struct tgt_info *info; struct wmi_host_ready_ev_param ready_ev; wmi_legacy_service_ready_callback legacy_callback; diff --git a/umac/cmn_services/crypto/inc/wlan_crypto_global_def.h b/umac/cmn_services/crypto/inc/wlan_crypto_global_def.h index f7e609f192..31bee444b8 100644 --- a/umac/cmn_services/crypto/inc/wlan_crypto_global_def.h +++ b/umac/cmn_services/crypto/inc/wlan_crypto_global_def.h @@ -265,7 +265,7 @@ struct wlan_crypto_req_key { uint16_t keyix; uint8_t keylen; uint8_t flags; - uint8_t macaddr[WLAN_MACADDR_LEN]; + uint8_t macaddr[QDF_MAC_ADDR_SIZE]; uint64_t keyrsc; uint64_t keytsc; uint8_t keydata[WLAN_CRYPTO_KEYBUF_SIZE + WLAN_CRYPTO_MICBUF_SIZE]; diff --git a/umac/cmn_services/inc/wlan_cmn.h b/umac/cmn_services/inc/wlan_cmn.h index 02ccca92a7..074e6cbc35 100644 --- a/umac/cmn_services/inc/wlan_cmn.h +++ b/umac/cmn_services/inc/wlan_cmn.h @@ -560,12 +560,12 @@ struct wlan_ssid { uint8_t ssid[WLAN_SSID_MAX_LEN]; }; -/* MAC address length */ -#define WLAN_MACADDR_LEN 6 +/* depreciated; use QDF_MAC_ADDR_SIZE instead */ +#define WLAN_MACADDR_LEN QDF_MAC_ADDR_SIZE /* Util API to copy the MAC address */ -#define WLAN_ADDR_COPY(dst, src) qdf_mem_copy(dst, src, WLAN_MACADDR_LEN) +#define WLAN_ADDR_COPY(dst, src) qdf_mem_copy(dst, src, QDF_MAC_ADDR_SIZE) /* Util API to compare the MAC address */ -#define WLAN_ADDR_EQ(a1, a2) qdf_mem_cmp(a1, a2, WLAN_MACADDR_LEN) +#define WLAN_ADDR_EQ(a1, a2) qdf_mem_cmp(a1, a2, QDF_MAC_ADDR_SIZE) #define PSOC_SERVICE_BM_SIZE ((128 + sizeof(uint32_t) - 1) / sizeof(uint32_t)) #define PSOC_HOST_MAX_NUM_SS (8) diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h index 4c87d8733f..9229c6ac36 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h @@ -36,7 +36,7 @@ /* simple hash is enough for variation of macaddr */ #define WLAN_PEER_HASH(addr) \ -(((const uint8_t *)(addr))[WLAN_MACADDR_LEN - 1] % WLAN_PEER_HASHSIZE) +(((const uint8_t *)(addr))[QDF_MAC_ADDR_SIZE - 1] % WLAN_PEER_HASHSIZE) #define obj_mgr_log(level, args...) \ QDF_TRACE(QDF_MODULE_ID_OBJ_MGR, level, ## args) diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h index d1addb76dd..02a125efc5 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h @@ -127,7 +127,7 @@ struct wlan_objmgr_pdev_nif { uint32_t pdev_fw_caps; uint32_t pdev_feature_caps; struct pdev_osif_priv *pdev_ospriv; - uint8_t macaddr[WLAN_MACADDR_LEN]; + uint8_t macaddr[QDF_MAC_ADDR_SIZE]; uint8_t notified_ap_vdev; }; diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h index 8b7160eb3e..eb392e3355 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h @@ -175,7 +175,7 @@ struct wlan_peer_activity { /*TODO */ struct wlan_objmgr_peer { qdf_list_node_t psoc_peer; qdf_list_node_t vdev_peer; - uint8_t macaddr[WLAN_MACADDR_LEN]; + uint8_t macaddr[QDF_MAC_ADDR_SIZE]; struct wlan_objmgr_peer_mlme peer_mlme; struct wlan_peer_activity peer_activity; struct wlan_objmgr_peer_objmgr peer_objmgr; diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h index a003e70b99..af142b0724 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h @@ -232,7 +232,7 @@ struct wlan_objmgr_psoc_nif { uint32_t soc_fw_ext_caps; uint32_t soc_feature_caps; uint32_t soc_op_flags; - uint8_t soc_hw_macaddr[WLAN_MACADDR_LEN]; + uint8_t soc_hw_macaddr[QDF_MAC_ADDR_SIZE]; struct wlan_objmgr_psoc_user_config user_config; }; diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h index 34a212986d..efbb2eb43a 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h @@ -251,8 +251,8 @@ struct wlan_vdev_create_params { enum QDF_OPMODE opmode; uint32_t flags; struct vdev_osif_priv *osifp; - uint8_t macaddr[WLAN_MACADDR_LEN]; - uint8_t mataddr[WLAN_MACADDR_LEN]; + uint8_t macaddr[QDF_MAC_ADDR_SIZE]; + uint8_t mataddr[QDF_MAC_ADDR_SIZE]; }; /** @@ -315,8 +315,8 @@ struct wlan_objmgr_vdev_mlme { uint32_t max_rate; uint32_t tx_mgmt_rate; uint32_t vdev_op_flags; - uint8_t mataddr[WLAN_MACADDR_LEN]; - uint8_t macaddr[WLAN_MACADDR_LEN]; + uint8_t mataddr[QDF_MAC_ADDR_SIZE]; + uint8_t macaddr[QDF_MAC_ADDR_SIZE]; char ssid[WLAN_SSID_MAX_LEN+1]; uint8_t ssid_len; }; diff --git a/utils/logging/src/wlan_roam_debug.c b/utils/logging/src/wlan_roam_debug.c index 037b0e7f1f..110827b82f 100644 --- a/utils/logging/src/wlan_roam_debug.c +++ b/utils/logging/src/wlan_roam_debug.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -86,10 +86,10 @@ void wlan_roam_debug_log(uint8_t vdev_id, uint8_t op, rec->peer_id = peer_id; if (mac_addr) qdf_mem_copy(rec->mac_addr.bytes, mac_addr, - WLAN_MACADDR_LEN); + QDF_MAC_ADDR_SIZE); else qdf_mem_zero(rec->mac_addr.bytes, - WLAN_MACADDR_LEN); + QDF_MAC_ADDR_SIZE); rec->peer_obj = peer_obj; rec->arg1 = arg1; rec->arg2 = arg2;