Browse Source

qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirHostOffloadReq

Replace tSirMacAddr with cdf_mac_addr in tSirHostOffloadReq.

Change-Id: I94c7eace8e49f6e5a83e3d58d7ee3250c8100c0f
CRs-Fixed: 898864
Srinivas Girigowda 9 years ago
parent
commit
b084b55cf1
3 changed files with 6 additions and 9 deletions
  1. 1 1
      core/mac/inc/sir_api.h
  2. 2 4
      core/sme/src/common/sme_power_save.c
  3. 3 4
      core/wma/src/wma_features.c

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

@@ -2569,7 +2569,7 @@ typedef struct sSirHostOffloadReq {
 #ifdef WLAN_NS_OFFLOAD
 	tSirNsOffloadReq nsOffloadInfo;
 #endif /* WLAN_NS_OFFLOAD */
-	tSirMacAddr bssId;
+	struct cdf_mac_addr bssid;
 } tSirHostOffloadReq, *tpSirHostOffloadReq;
 
 /* Packet Types. */

+ 2 - 4
core/sme/src/common/sme_power_save.c

@@ -990,8 +990,7 @@ CDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx,
 		return CDF_STATUS_E_NOMEM;
 	}
 
-	cdf_mem_copy(request->bssId, session->connectedProfile.bssid.bytes,
-			sizeof(tSirMacAddr));
+	cdf_copy_macaddr(&request->bssid, &session->connectedProfile.bssid);
 
 	cdf_mem_copy(request_buf, request, sizeof(tSirHostOffloadReq));
 
@@ -1033,8 +1032,7 @@ CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx,
 		return CDF_STATUS_E_FAILURE;
 	}
 
-	cdf_mem_copy(request->bssId, session->connectedProfile.bssid.bytes,
-			sizeof(tSirMacAddr));
+	cdf_copy_macaddr(&request->bssid, &session->connectedProfile.bssid);
 
 	request_buf = cdf_mem_malloc(sizeof(*request_buf));
 	if (NULL == request_buf) {

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

@@ -4910,15 +4910,15 @@ CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma,
 	uint32_t count = 0, num_ns_ext_tuples = 0;
 
 	/* Get the vdev id */
-	if (!wma_find_vdev_by_bssid(wma, pHostOffloadParams->bssId, &vdev_id)) {
+	if (!wma_find_vdev_by_bssid(wma, pHostOffloadParams->bssid.bytes,
+					&vdev_id)) {
 		WMA_LOGE("vdev handle is invalid for %pM",
-			 pHostOffloadParams->bssId);
+			 pHostOffloadParams->bssid.bytes);
 		cdf_mem_free(pHostOffloadParams);
 		return CDF_STATUS_E_INVAL;
 	}
 
 	if (!wma->interfaces[vdev_id].vdev_up) {
-
 		WMA_LOGE("vdev %d is not up skipping arp/ns offload", vdev_id);
 		cdf_mem_free(pHostOffloadParams);
 		return CDF_STATUS_E_FAILURE;
@@ -4927,7 +4927,6 @@ CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma,
 	if (!bArpOnly)
 		count = pHostOffloadParams->num_ns_offload_count;
 
-
 	len = sizeof(WMI_SET_ARP_NS_OFFLOAD_CMD_fixed_param) + WMI_TLV_HDR_SIZE +       /* TLV place holder size for array of NS tuples */
 	      WMI_MAX_NS_OFFLOADS * sizeof(WMI_NS_OFFLOAD_TUPLE) + WMI_TLV_HDR_SIZE +   /* TLV place holder size for array of ARP tuples */
 	      WMI_MAX_ARP_OFFLOADS * sizeof(WMI_ARP_OFFLOAD_TUPLE);