Эх сурвалжийг харах

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

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

Change-Id: Id8ee0e1a4d6057f74ea5b7122a33f5137ea533e4
CRs-Fixed: 2435753
Srinivas Girigowda 6 жил өмнө
parent
commit
7c3ae6158e

+ 1 - 1
pmo/core/src/wlan_pmo_arp.c

@@ -58,7 +58,7 @@ static QDF_STATUS pmo_core_cache_arp_in_vdev_priv(
 	request->enable = PMO_OFFLOAD_ENABLE;
 	request->is_offload_applied = false;
 	/* 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] =
 		(arp_req->ipv4_addr >> (index * 8)) & 0xFF;
 

+ 1 - 1
pmo/core/src/wlan_pmo_ns.c

@@ -54,7 +54,7 @@ static void pmo_core_fill_ns_addr(struct pmo_ns_offload_params *request,
 					ns_req->ipv6_addr[i][15];
 		request->slot_idx = 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] =
 			PMO_IPV6_ADDR_VALID;

+ 2 - 2
pmo/dispatcher/inc/wlan_pmo_arp_public_struct.h

@@ -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
  * 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 {
 	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;
 	bool is_offload_applied;
 };

+ 0 - 2
pmo/dispatcher/inc/wlan_pmo_common_public_struct.h

@@ -39,7 +39,6 @@
 #include "qdf_event.h"
 #include "wlan_pmo_hw_filter_public_struct.h"
 
-#define PMO_IPV4_ADDR_LEN         4
 
 #define PMO_IPV4_ARP_REPLY_OFFLOAD                  0
 #define PMO_IPV6_NEIGHBOR_DISCOVERY_OFFLOAD         1
@@ -49,7 +48,6 @@
 
 #define PMO_MAC_NS_OFFLOAD_SIZE               1
 #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_UC_TYPE                 0
 #define PMO_IPV6_ADDR_AC_TYPE                 1

+ 5 - 5
pmo/dispatcher/inc/wlan_pmo_ns_public_struct.h

@@ -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
  * 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 {
 	uint8_t enable;
 	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]
-		[PMO_MAC_IPV6_ADDR_LEN];
+		[QDF_IPV6_ADDR_SIZE];
 	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;
 	uint8_t src_ipv6_addr_valid;
 	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;
 	uint32_t count;
 	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];
 	enum pmo_ns_addr_scope scope[PMO_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA];
 };