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

qcacmn: Deprecate WLAN_MACADDR_LEN

Browse Source 
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
This commit is contained in:
Dustin Brown
2018-01-26 17:21:57 -08:00
committed by snandini
parent 013ae979a6
commit fb6527630f
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target_if/init_deinit/src/init_event_handler.c
View File

@@ -305,7 +305,7 @@ static int init_deinit_ready_event_handler(ol_scn_t scn_handle,
struct target_psoc_info *tgt_hdl; struct target_psoc_info *tgt_hdl;
void *wmi_handle; void *wmi_handle;
struct wmi_host_fw_abi_ver fw_ver; 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 tgt_info *info;
struct wmi_host_ready_ev_param ready_ev; struct wmi_host_ready_ev_param ready_ev;
wmi_legacy_service_ready_callback legacy_callback; wmi_legacy_service_ready_callback legacy_callback;

2
umac/cmn_services/crypto/inc/wlan_crypto_global_def.h
View File

@@ -265,7 +265,7 @@ struct wlan_crypto_req_key {
uint16_t keyix; uint16_t keyix;
uint8_t keylen; uint8_t keylen;
uint8_t flags; uint8_t flags;
uint8_t macaddr[WLAN_MACADDR_LEN]; uint8_t macaddr[QDF_MAC_ADDR_SIZE];
uint64_t keyrsc; uint64_t keyrsc;
uint64_t keytsc; uint64_t keytsc;
uint8_t keydata[WLAN_CRYPTO_KEYBUF_SIZE + WLAN_CRYPTO_MICBUF_SIZE]; uint8_t keydata[WLAN_CRYPTO_KEYBUF_SIZE + WLAN_CRYPTO_MICBUF_SIZE];

8
umac/cmn_services/inc/wlan_cmn.h
View File

@@ -560,12 +560,12 @@ struct wlan_ssid {
uint8_t ssid[WLAN_SSID_MAX_LEN]; uint8_t ssid[WLAN_SSID_MAX_LEN];
}; };
/* MAC address length */ /* depreciated; use QDF_MAC_ADDR_SIZE instead */
#define WLAN_MACADDR_LEN 6 #define WLAN_MACADDR_LEN QDF_MAC_ADDR_SIZE
/* Util API to copy the MAC address */ /* 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 */ /* 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_SERVICE_BM_SIZE ((128 + sizeof(uint32_t) - 1) / sizeof(uint32_t))
#define PSOC_HOST_MAX_NUM_SS (8) #define PSOC_HOST_MAX_NUM_SS (8)

2
umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
View File

@@ -36,7 +36,7 @@
/* simple hash is enough for variation of macaddr */ /* simple hash is enough for variation of macaddr */
#define WLAN_PEER_HASH(addr) \ #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...) \ #define obj_mgr_log(level, args...) \
QDF_TRACE(QDF_MODULE_ID_OBJ_MGR, level, ## args) QDF_TRACE(QDF_MODULE_ID_OBJ_MGR, level, ## args)

2
umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h
View File

@@ -127,7 +127,7 @@ struct wlan_objmgr_pdev_nif {
uint32_t pdev_fw_caps; uint32_t pdev_fw_caps;
uint32_t pdev_feature_caps; uint32_t pdev_feature_caps;
struct pdev_osif_priv *pdev_ospriv; struct pdev_osif_priv *pdev_ospriv;
uint8_t macaddr[WLAN_MACADDR_LEN]; uint8_t macaddr[QDF_MAC_ADDR_SIZE];
uint8_t notified_ap_vdev; uint8_t notified_ap_vdev;
}; };

2
umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h
View File

@@ -175,7 +175,7 @@ struct wlan_peer_activity { /*TODO */
struct wlan_objmgr_peer { struct wlan_objmgr_peer {
qdf_list_node_t psoc_peer; qdf_list_node_t psoc_peer;
qdf_list_node_t vdev_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_objmgr_peer_mlme peer_mlme;
struct wlan_peer_activity peer_activity; struct wlan_peer_activity peer_activity;
struct wlan_objmgr_peer_objmgr peer_objmgr; struct wlan_objmgr_peer_objmgr peer_objmgr;

2
umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h
View File

@@ -232,7 +232,7 @@ struct wlan_objmgr_psoc_nif {
uint32_t soc_fw_ext_caps; uint32_t soc_fw_ext_caps;
uint32_t soc_feature_caps; uint32_t soc_feature_caps;
uint32_t soc_op_flags; 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; struct wlan_objmgr_psoc_user_config user_config;
}; };

8
umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h
View File

@@ -251,8 +251,8 @@ struct wlan_vdev_create_params {
enum QDF_OPMODE opmode; enum QDF_OPMODE opmode;
uint32_t flags; uint32_t flags;
struct vdev_osif_priv *osifp; struct vdev_osif_priv *osifp;
uint8_t macaddr[WLAN_MACADDR_LEN]; uint8_t macaddr[QDF_MAC_ADDR_SIZE];
uint8_t mataddr[WLAN_MACADDR_LEN]; uint8_t mataddr[QDF_MAC_ADDR_SIZE];
}; };
/** /**
@@ -315,8 +315,8 @@ struct wlan_objmgr_vdev_mlme {
uint32_t max_rate; uint32_t max_rate;
uint32_t tx_mgmt_rate; uint32_t tx_mgmt_rate;
uint32_t vdev_op_flags; uint32_t vdev_op_flags;
uint8_t mataddr[WLAN_MACADDR_LEN]; uint8_t mataddr[QDF_MAC_ADDR_SIZE];
uint8_t macaddr[WLAN_MACADDR_LEN]; uint8_t macaddr[QDF_MAC_ADDR_SIZE];
char ssid[WLAN_SSID_MAX_LEN+1]; char ssid[WLAN_SSID_MAX_LEN+1];
uint8_t ssid_len; uint8_t ssid_len;
}; };

6
utils/logging/src/wlan_roam_debug.c
View File

@@ -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 * 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
@@ -86,10 +86,10 @@ void wlan_roam_debug_log(uint8_t vdev_id, uint8_t op,
rec->peer_id = peer_id; rec->peer_id = peer_id;
if (mac_addr) if (mac_addr)
qdf_mem_copy(rec->mac_addr.bytes, mac_addr, qdf_mem_copy(rec->mac_addr.bytes, mac_addr,
WLAN_MACADDR_LEN); QDF_MAC_ADDR_SIZE);
else else
qdf_mem_zero(rec->mac_addr.bytes, qdf_mem_zero(rec->mac_addr.bytes,
WLAN_MACADDR_LEN); QDF_MAC_ADDR_SIZE);
rec->peer_obj = peer_obj; rec->peer_obj = peer_obj;
rec->arg1 = arg1; rec->arg1 = arg1;
rec->arg2 = arg2; rec->arg2 = arg2;