lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Replace multiple IPv4/v6 address len macros with QDF macro

Browse Source 
Replace multiple IPv4/v6 address len macros with QDF macro.

Change-Id: Id8ee0e1a4d6057f74ea5b7122a33f5137ea533e4
CRs-Fixed: 2435753
This commit is contained in:
Srinivas Girigowda 2019-04-15 15:08:28 -07:00 committed by nshrivas
parent 8009443ffd
commit d1e45b8dc7
10 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/pmo/core/src/wlan_pmo_arp.c
View File

@ -58,7 +58,7 @@ static QDF_STATUS pmo_core_cache_arp_in_vdev_priv(
request->enable = PMO_OFFLOAD_ENABLE; request->enable = PMO_OFFLOAD_ENABLE;
request->is_offload_applied = false; request->is_offload_applied = false;
/* converting u32 to IPV4 address */ /* converting u32 to IPV4 address */
for (index = 0; index < PMO_IPV4_ADDR_LEN; index++) for (index = 0; index < QDF_IPV4_ADDR_SIZE; index++)
request->host_ipv4_addr[index] = request->host_ipv4_addr[index] =
(arp_req->ipv4_addr >> (index * 8)) & 0xFF; (arp_req->ipv4_addr >> (index * 8)) & 0xFF;

2
components/pmo/core/src/wlan_pmo_ns.c
View File

@ -54,7 +54,7 @@ static void pmo_core_fill_ns_addr(struct pmo_ns_offload_params *request,
ns_req->ipv6_addr[i][15]; ns_req->ipv6_addr[i][15];
request->slot_idx = i; request->slot_idx = i;
qdf_mem_copy(&request->target_ipv6_addr[i], qdf_mem_copy(&request->target_ipv6_addr[i],
&ns_req->ipv6_addr[i][0], PMO_MAC_IPV6_ADDR_LEN); &ns_req->ipv6_addr[i][0], QDF_IPV6_ADDR_SIZE);
request->target_ipv6_addr_valid[i] = request->target_ipv6_addr_valid[i] =
PMO_IPV6_ADDR_VALID; PMO_IPV6_ADDR_VALID;

4
components/pmo/dispatcher/inc/wlan_pmo_arp_public_struct.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * Copyright (c) 2017-2019 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
@ -50,7 +50,7 @@ struct pmo_arp_req {
*/ */
struct pmo_arp_offload_params { struct pmo_arp_offload_params {
uint8_t enable; uint8_t enable;
uint8_t host_ipv4_addr[PMO_IPV4_ADDR_LEN]; uint8_t host_ipv4_addr[QDF_IPV4_ADDR_SIZE];
struct qdf_mac_addr bssid; struct qdf_mac_addr bssid;
bool is_offload_applied; bool is_offload_applied;
}; };

2
components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h
View File

@ -39,7 +39,6 @@
#include "qdf_event.h" #include "qdf_event.h"
#include "wlan_pmo_hw_filter_public_struct.h" #include "wlan_pmo_hw_filter_public_struct.h"
#define PMO_IPV4_ADDR_LEN 4
#define PMO_IPV4_ARP_REPLY_OFFLOAD 0 #define PMO_IPV4_ARP_REPLY_OFFLOAD 0
#define PMO_IPV6_NEIGHBOR_DISCOVERY_OFFLOAD 1 #define PMO_IPV6_NEIGHBOR_DISCOVERY_OFFLOAD 1
@ -49,7 +48,6 @@
#define PMO_MAC_NS_OFFLOAD_SIZE 1 #define PMO_MAC_NS_OFFLOAD_SIZE 1
#define PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA 16 #define PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA 16
#define PMO_MAC_IPV6_ADDR_LEN 16
#define PMO_IPV6_ADDR_VALID 1 #define PMO_IPV6_ADDR_VALID 1
#define PMO_IPV6_ADDR_UC_TYPE 0 #define PMO_IPV6_ADDR_UC_TYPE 0
#define PMO_IPV6_ADDR_AC_TYPE 1 #define PMO_IPV6_ADDR_AC_TYPE 1

10
components/pmo/dispatcher/inc/wlan_pmo_ns_public_struct.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * Copyright (c) 2017-2019 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
@ -62,11 +62,11 @@ enum pmo_ns_addr_scope {
struct pmo_ns_offload_params { struct pmo_ns_offload_params {
uint8_t enable; uint8_t enable;
uint32_t num_ns_offload_count; uint32_t num_ns_offload_count;
uint8_t src_ipv6_addr[PMO_MAC_IPV6_ADDR_LEN]; uint8_t src_ipv6_addr[QDF_IPV6_ADDR_SIZE];
uint8_t self_ipv6_addr[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA] uint8_t self_ipv6_addr[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA]
[PMO_MAC_IPV6_ADDR_LEN]; [QDF_IPV6_ADDR_SIZE];
uint8_t target_ipv6_addr[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA] uint8_t target_ipv6_addr[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA]
[PMO_MAC_IPV6_ADDR_LEN]; [QDF_IPV6_ADDR_SIZE];
struct qdf_mac_addr self_macaddr; struct qdf_mac_addr self_macaddr;
uint8_t src_ipv6_addr_valid; uint8_t src_ipv6_addr_valid;
uint8_t target_ipv6_addr_valid[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA]; uint8_t target_ipv6_addr_valid[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA];
@ -92,7 +92,7 @@ struct pmo_ns_req {
enum pmo_offload_trigger trigger; enum pmo_offload_trigger trigger;
uint32_t count; uint32_t count;
uint8_t ipv6_addr[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA] uint8_t ipv6_addr[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA]
[PMO_MAC_IPV6_ADDR_LEN]; [QDF_IPV6_ADDR_SIZE];
uint8_t ipv6_addr_type[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA]; uint8_t ipv6_addr_type[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA];
enum pmo_ns_addr_scope scope[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA]; enum pmo_ns_addr_scope scope[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA];
}; };

6
core/hdd/inc/wlan_hdd_host_offload.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * Copyright (c) 2014-2017, 2019 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
@ -41,8 +41,8 @@ struct host_offload_req {
uint8_t offloadType; uint8_t offloadType;
uint8_t enableOrDisable; uint8_t enableOrDisable;
union { union {
uint8_t hostIpv4Addr[SIR_IPV4_ADDR_LEN]; uint8_t hostIpv4Addr[QDF_IPV4_ADDR_SIZE];
uint8_t hostIpv6Addr[SIR_MAC_IPV6_ADDR_LEN]; uint8_t hostIpv6Addr[QDF_IPV6_ADDR_SIZE];
} params; } params;
struct qdf_mac_addr bssId; struct qdf_mac_addr bssId;
}; };

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

@ -280,7 +280,7 @@ int wlan_hdd_ipv6_changed(struct notifier_block *nb,
* Return: 0 on success, error number otherwise. * Return: 0 on success, error number otherwise.
*/ */
static int hdd_fill_ipv6_uc_addr(struct inet6_dev *idev, static int hdd_fill_ipv6_uc_addr(struct inet6_dev *idev,
uint8_t ipv6_uc_addr[][SIR_MAC_IPV6_ADDR_LEN], uint8_t ipv6_uc_addr[][QDF_IPV6_ADDR_SIZE],
uint8_t *ipv6addr_type, uint8_t *ipv6addr_type,
enum pmo_ns_addr_scope *scope_array, enum pmo_ns_addr_scope *scope_array,
uint32_t *count) uint32_t *count)
@ -333,7 +333,7 @@ static int hdd_fill_ipv6_uc_addr(struct inet6_dev *idev,
* Return: 0 on success, error number otherwise. * Return: 0 on success, error number otherwise.
*/ */
static int hdd_fill_ipv6_ac_addr(struct inet6_dev *idev, static int hdd_fill_ipv6_ac_addr(struct inet6_dev *idev,
uint8_t ipv6_ac_addr[][SIR_MAC_IPV6_ADDR_LEN], uint8_t ipv6_ac_addr[][QDF_IPV6_ADDR_SIZE],
uint8_t *ipv6addr_type, uint8_t *ipv6addr_type,
enum pmo_ns_addr_scope *scope_array, enum pmo_ns_addr_scope *scope_array,
uint32_t *count) uint32_t *count)

8
core/mac/inc/sir_api.h
View File

@ -65,9 +65,7 @@ struct mac_context;
#define SIR_NUM_11B_RATES 4 /* 1,2,5.5,11 */ #define SIR_NUM_11B_RATES 4 /* 1,2,5.5,11 */
#define SIR_NUM_11A_RATES 8 /* 6,9,12,18,24,36,48,54 */ #define SIR_NUM_11A_RATES 8 /* 6,9,12,18,24,36,48,54 */
#define SIR_IPV4_ADDR_LEN 4 typedef uint8_t tSirIpv4Addr[QDF_IPV4_ADDR_SIZE];
typedef uint8_t tSirIpv4Addr[SIR_IPV4_ADDR_LEN];
#define SIR_VERSION_STRING_LEN 64 #define SIR_VERSION_STRING_LEN 64
typedef uint8_t tSirVersionString[SIR_VERSION_STRING_LEN]; typedef uint8_t tSirVersionString[SIR_VERSION_STRING_LEN];
@ -1933,8 +1931,8 @@ struct sir_host_offload_req {
uint8_t enableOrDisable; uint8_t enableOrDisable;
uint32_t num_ns_offload_count; uint32_t num_ns_offload_count;
union { union {
uint8_t hostIpv4Addr[SIR_IPV4_ADDR_LEN]; uint8_t hostIpv4Addr[QDF_IPV4_ADDR_SIZE];
uint8_t hostIpv6Addr[SIR_MAC_IPV6_ADDR_LEN]; uint8_t hostIpv6Addr[QDF_IPV6_ADDR_SIZE];
} params; } params;
struct qdf_mac_addr bssid; struct qdf_mac_addr bssid;
}; };

1
core/mac/inc/sir_mac_prot_def.h
View File

@ -319,7 +319,6 @@
/* min size of wme oui header: oui(3) + type + subtype + version */ /* min size of wme oui header: oui(3) + type + subtype + version */
#define SIR_MAC_OUI_WME_HDR_MIN 6 #define SIR_MAC_OUI_WME_HDR_MIN 6
#define SIR_MAC_IPV6_ADDR_LEN 16
/* ----------------------------------------------------------------------------- */ /* ----------------------------------------------------------------------------- */
/* OFFSET definitions for fixed fields in Management frames */ /* OFFSET definitions for fixed fields in Management frames */

8
core/sme/src/common/sme_api.c
View File

@ -6120,7 +6120,7 @@ void sme_send_hlp_ie_info(mac_handle_t mac_handle, uint8_t vdev_id,
return; return;
if ((profile->hlp_ie_len + if ((profile->hlp_ie_len +
SIR_IPV4_ADDR_LEN) > FILS_MAX_HLP_DATA_LEN) { QDF_IPV4_ADDR_SIZE) > FILS_MAX_HLP_DATA_LEN) {
sme_err("HLP IE len exceeds %d", sme_err("HLP IE len exceeds %d",
profile->hlp_ie_len); profile->hlp_ie_len);
qdf_mem_free(params); qdf_mem_free(params);
@ -6128,12 +6128,12 @@ void sme_send_hlp_ie_info(mac_handle_t mac_handle, uint8_t vdev_id,
} }
params->vdev_id = vdev_id; params->vdev_id = vdev_id;
params->hlp_ie_len = profile->hlp_ie_len + SIR_IPV4_ADDR_LEN; params->hlp_ie_len = profile->hlp_ie_len + QDF_IPV4_ADDR_SIZE;
for (i = 0; i < SIR_IPV4_ADDR_LEN; i++) for (i = 0; i < QDF_IPV4_ADDR_SIZE; i++)
params->hlp_ie[i] = (if_addr >> (i * 8)) & 0xFF; params->hlp_ie[i] = (if_addr >> (i * 8)) & 0xFF;
qdf_mem_copy(params->hlp_ie + SIR_IPV4_ADDR_LEN, qdf_mem_copy(params->hlp_ie + QDF_IPV4_ADDR_SIZE,
profile->hlp_ie, profile->hlp_ie_len); profile->hlp_ie, profile->hlp_ie_len);
msg.type = SIR_HAL_HLP_IE_INFO; msg.type = SIR_HAL_HLP_IE_INFO;