qcacmn: Deprecate WLAN_MACADDR_LEN
At some point WLAN_MACADDR_LEN was added to the driver, despite
QDF_MAC_ADDR_SIZE already serving the same purpose. There are cases
where these two macros are implicitly assumed to be the same value.
This is a classic single-source-of-truth violation, and only serves to
confuse developers. Deprecate WLAN_MACADDR_LEN and use
QDF_MAC_ADDR_SIZE instead.
Change-Id: I4e941d5e17d161a5810e693c89b95ae08f83c6b0
CRs-Fixed: 2179728
diff --git a/target_if/init_deinit/src/init_event_handler.c b/target_if/init_deinit/src/init_event_handler.c
index 9f7b3ce..a4b9df1 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 @@
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 f7e609f..31bee44 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 @@
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 02ccca9..074e6cb 100644
--- a/umac/cmn_services/inc/wlan_cmn.h
+++ b/umac/cmn_services/inc/wlan_cmn.h
@@ -560,12 +560,12 @@
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 4c87d87..9229c6a 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 d1addb7..02a125e 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 @@
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 8b7160e..eb392e3 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_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 a003e70..af142b0 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 @@
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 34a2129..efbb2eb 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 @@
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 @@
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 037b0e7..110827b 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 @@
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;