Ver Fonte

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirNsOffloadReq

Replace tSirMacAddr with cdf_mac_addr in tSirNsOffloadReq.

Change-Id: Ic53f963b3df46d67bf5f202ac6aaf7c49ab858a9
CRs-Fixed: 898864
Srinivas Girigowda há 9 anos atrás
pai
commit
110d620564
3 ficheiros alterados com 7 adições e 7 exclusões
  1. 2 3
      core/hdd/src/wlan_hdd_power.c
  2. 1 1
      core/mac/inc/sir_api.h
  3. 4 3
      core/wma/src/wma_features.c

+ 2 - 3
core/hdd/src/wlan_hdd_power.c

@@ -387,9 +387,8 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable)
 			}
 			offLoadRequest.offloadType =  SIR_IPV6_NS_OFFLOAD;
 			offLoadRequest.enableOrDisable = SIR_OFFLOAD_ENABLE;
-			cdf_mem_copy(&offLoadRequest.nsOffloadInfo.selfMacAddr,
-					&pAdapter->macAddressCurrent.bytes,
-					CDF_MAC_ADDR_SIZE);
+			cdf_copy_macaddr(&offLoadRequest.nsOffloadInfo.self_macaddr,
+					 &pAdapter->macAddressCurrent);
 			/* set number of ns offload address count */
 			offLoadRequest.num_ns_offload_count = count;
 			/* Configure the Firmware with this */

+ 1 - 1
core/mac/inc/sir_api.h

@@ -2540,7 +2540,7 @@ typedef struct sSirNsOffloadReq {
 	uint8_t srcIPv6Addr[SIR_MAC_IPV6_ADDR_LEN];
 	uint8_t selfIPv6Addr[SIR_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA][SIR_MAC_IPV6_ADDR_LEN];
 	uint8_t targetIPv6Addr[SIR_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA][SIR_MAC_IPV6_ADDR_LEN];
-	tSirMacAddr selfMacAddr;
+	struct cdf_mac_addr self_macaddr;
 	uint8_t srcIPv6AddrValid;
 	uint8_t targetIPv6AddrValid[SIR_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA];
 	uint8_t slotIdx;

+ 4 - 3
core/wma/src/wma_features.c

@@ -5185,8 +5185,8 @@ CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma,
 			 * local MAC address rather than the tuple
 			 */
 			WMI_CHAR_ARRAY_TO_MAC_ADDR(pHostOffloadParams->
-						   nsOffloadInfo.selfMacAddr,
-						   &ns_tuple->target_mac);
+					nsOffloadInfo.self_macaddr.bytes,
+					&ns_tuple->target_mac);
 #endif /* WLAN_NS_OFFLOAD */
 			if ((ns_tuple->target_mac.mac_addr31to0 != 0) ||
 			    (ns_tuple->target_mac.mac_addr47to32 != 0)) {
@@ -5250,7 +5250,8 @@ CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma,
 
 				/* target MAC is optional, check if it is valid, if this is not valid,
 				 * the target will use the known local MAC address rather than the tuple */
-				 WMI_CHAR_ARRAY_TO_MAC_ADDR(pHostOffloadParams->nsOffloadInfo.selfMacAddr,
+				 WMI_CHAR_ARRAY_TO_MAC_ADDR(
+					pHostOffloadParams->nsOffloadInfo.self_macaddr.bytes,
 					&ns_tuple->target_mac);
 #endif
 				if ((ns_tuple->target_mac.mac_addr31to0 != 0) ||