Prechádzať zdrojové kódy

qcacld-3.0: Rename hHdd to hdd_handle

Rename hHdd to hdd_handle to avoid camelCase.

Change-Id: I338b39e128dbd3c1560695fcbb49c5a4bc470169
CRs-Fixed: 2271551
Jeff Johnson 7 rokov pred
rodič
commit
6aaaa997e4

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

@@ -857,7 +857,7 @@ typedef struct sAniSirGlobal {
 	tAniSirSys sys;
 	tAniSirSys sys;
 
 
 	/* PAL/HDD handle */
 	/* PAL/HDD handle */
-	hdd_handle_t hHdd;
+	hdd_handle_t hdd_handle;
 
 
 
 
 	tSmeStruct sme;
 	tSmeStruct sme;

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

@@ -35,7 +35,7 @@
 QDF_STATUS mac_start(tHalHandle hHal, void *pHalMacStartParams);
 QDF_STATUS mac_start(tHalHandle hHal, void *pHalMacStartParams);
 QDF_STATUS mac_stop(tHalHandle hHal, tHalStopType stopType);
 QDF_STATUS mac_stop(tHalHandle hHal, tHalStopType stopType);
 QDF_STATUS mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle,
 QDF_STATUS mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle,
-		    hdd_handle_t hHdd, struct cds_config_info *cds_cfg);
+		    hdd_handle_t hdd_handle, struct cds_config_info *cds_cfg);
 QDF_STATUS mac_close(tHalHandle hHal);
 QDF_STATUS mac_close(tHalHandle hHal);
 
 
 #endif /* __MAC_INIT_API_H */
 #endif /* __MAC_INIT_API_H */

+ 2 - 1
core/mac/src/pe/lim/lim_link_monitoring_algo.c

@@ -556,7 +556,8 @@ void lim_handle_heart_beat_failure(tpAniSirGlobal mac_ctx,
 
 
 hb_handler_fail:
 hb_handler_fail:
 	if (mac_ctx->sme.tx_queue_cb)
 	if (mac_ctx->sme.tx_queue_cb)
-		mac_ctx->sme.tx_queue_cb(mac_ctx->hHdd, session->smeSessionId,
+		mac_ctx->sme.tx_queue_cb(mac_ctx->hdd_handle,
+					 session->smeSessionId,
 					 WLAN_WAKE_ALL_NETIF_QUEUE,
 					 WLAN_WAKE_ALL_NETIF_QUEUE,
 					 WLAN_CONTROL_PATH);
 					 WLAN_CONTROL_PATH);
 }
 }

+ 6 - 6
core/mac/src/pe/lim/lim_send_management_frames.c

@@ -3192,7 +3192,7 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac,
 	nBytes = nPayload + sizeof(tSirMacMgmtHdr);
 	nBytes = nPayload + sizeof(tSirMacMgmtHdr);
 
 
 	qdf_status =
 	qdf_status =
-		cds_packet_alloc(pMac->hHdd, TXRX_FRM_802_11_MGMT,
+		cds_packet_alloc(pMac->hdd_handle, TXRX_FRM_802_11_MGMT,
 				 (uint16_t) nBytes, (void **)&pFrame,
 				 (uint16_t) nBytes, (void **)&pFrame,
 				 (void **)&pPacket);
 				 (void **)&pPacket);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -3220,7 +3220,7 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac,
 	if (DOT11F_FAILED(nStatus)) {
 	if (DOT11F_FAILED(nStatus)) {
 		pe_err("Failed to pack a Measurement Report (0x%08x)",
 		pe_err("Failed to pack a Measurement Report (0x%08x)",
 			nStatus);
 			nStatus);
-		cds_packet_free(pMac->hHdd, TXRX_FRM_802_11_MGMT,
+		cds_packet_free(pMac->hdd_handle, TXRX_FRM_802_11_MGMT,
 				(void *)pFrame, (void *)pPacket);
 				(void *)pFrame, (void *)pPacket);
 		return QDF_STATUS_E_FAILURE;    /* allocated! */
 		return QDF_STATUS_E_FAILURE;    /* allocated! */
 	} else if (DOT11F_WARNED(nStatus)) {
 	} else if (DOT11F_WARNED(nStatus)) {
@@ -3292,7 +3292,7 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac,
 	nBytes = nPayload + sizeof(tSirMacMgmtHdr);
 	nBytes = nPayload + sizeof(tSirMacMgmtHdr);
 
 
 	qdf_status =
 	qdf_status =
-		cds_packet_alloc(pMac->hHdd, TXRX_FRM_802_11_MGMT,
+		cds_packet_alloc(pMac->hdd_handle, TXRX_FRM_802_11_MGMT,
 				 (uint16_t) nBytes, (void **)&pFrame,
 				 (uint16_t) nBytes, (void **)&pFrame,
 				 (void **)&pPacket);
 				 (void **)&pPacket);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -3320,7 +3320,7 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac,
 	if (DOT11F_FAILED(nStatus)) {
 	if (DOT11F_FAILED(nStatus)) {
 		pe_err("Failed to pack a TPC Request (0x%08x)",
 		pe_err("Failed to pack a TPC Request (0x%08x)",
 			nStatus);
 			nStatus);
-		cds_packet_free(pMac->hHdd, TXRX_FRM_802_11_MGMT,
+		cds_packet_free(pMac->hdd_handle, TXRX_FRM_802_11_MGMT,
 				(void *)pFrame, (void *)pPacket);
 				(void *)pFrame, (void *)pPacket);
 		return;         /* allocated! */
 		return;         /* allocated! */
 	} else if (DOT11F_WARNED(nStatus)) {
 	} else if (DOT11F_WARNED(nStatus)) {
@@ -3395,7 +3395,7 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac,
 	nBytes = nPayload + sizeof(tSirMacMgmtHdr);
 	nBytes = nPayload + sizeof(tSirMacMgmtHdr);
 
 
 	qdf_status =
 	qdf_status =
-		cds_packet_alloc(pMac->hHdd, TXRX_FRM_802_11_MGMT,
+		cds_packet_alloc(pMac->hdd_handle, TXRX_FRM_802_11_MGMT,
 				 (uint16_t) nBytes, (void **)&pFrame,
 				 (uint16_t) nBytes, (void **)&pFrame,
 				 (void **)&pPacket);
 				 (void **)&pPacket);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -3424,7 +3424,7 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac,
 	if (DOT11F_FAILED(nStatus)) {
 	if (DOT11F_FAILED(nStatus)) {
 		pe_err("Failed to pack a TPC Report (0x%08x)",
 		pe_err("Failed to pack a TPC Report (0x%08x)",
 			nStatus);
 			nStatus);
-		cds_packet_free(pMac->hHdd, TXRX_FRM_802_11_MGMT,
+		cds_packet_free(pMac->hdd_handle, TXRX_FRM_802_11_MGMT,
 				(void *)pFrame, (void *)pPacket);
 				(void *)pFrame, (void *)pPacket);
 		return QDF_STATUS_E_FAILURE;    /* allocated! */
 		return QDF_STATUS_E_FAILURE;    /* allocated! */
 	} else if (DOT11F_WARNED(nStatus)) {
 	} else if (DOT11F_WARNED(nStatus)) {

+ 1 - 1
core/mac/src/pe/lim/lim_utils.c

@@ -5524,7 +5524,7 @@ void lim_handle_heart_beat_failure_timeout(tpAniSirGlobal mac_ctx)
 			lim_print_mlm_state(mac_ctx, LOGE,
 			lim_print_mlm_state(mac_ctx, LOGE,
 				psession_entry->limMlmState);
 				psession_entry->limMlmState);
 			if (mac_ctx->sme.tx_queue_cb)
 			if (mac_ctx->sme.tx_queue_cb)
-				mac_ctx->sme.tx_queue_cb(mac_ctx->hHdd,
+				mac_ctx->sme.tx_queue_cb(mac_ctx->hdd_handle,
 						psession_entry->smeSessionId,
 						psession_entry->smeSessionId,
 						WLAN_WAKE_ALL_NETIF_QUEUE,
 						WLAN_WAKE_ALL_NETIF_QUEUE,
 						WLAN_CONTROL_PATH);
 						WLAN_CONTROL_PATH);

+ 3 - 3
core/mac/src/sys/legacy/src/system/src/mac_init_api.c

@@ -86,13 +86,13 @@ QDF_STATUS mac_stop(tHalHandle hHal, tHalStopType stopType)
    \brief this function will be called during init. This function is suppose to allocate all the
    \brief this function will be called during init. This function is suppose to allocate all the
  \       memory with the global context will be allocated here.
  \       memory with the global context will be allocated here.
    \param   tHalHandle pHalHandle
    \param   tHalHandle pHalHandle
-   \param   hdd_handle_t hHdd
+   \param   hdd_handle_t hdd_handle
    \param   tHalOpenParameters* pHalOpenParams
    \param   tHalOpenParameters* pHalOpenParams
    \return QDF_STATUS
    \return QDF_STATUS
    -------------------------------------------------------------*/
    -------------------------------------------------------------*/
 
 
 QDF_STATUS mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle,
 QDF_STATUS mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle,
-		    hdd_handle_t hHdd, struct cds_config_info *cds_cfg)
+		    hdd_handle_t hdd_handle, struct cds_config_info *cds_cfg)
 {
 {
 	tpAniSirGlobal p_mac = &global_mac_context;
 	tpAniSirGlobal p_mac = &global_mac_context;
 	QDF_STATUS status;
 	QDF_STATUS status;
@@ -105,7 +105,7 @@ QDF_STATUS mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle,
 	 * (Could be platform dependent as some variables in p_mac are platform
 	 * (Could be platform dependent as some variables in p_mac are platform
 	 * dependent)
 	 * dependent)
 	 */
 	 */
-	p_mac->hHdd = hHdd;
+	p_mac->hdd_handle = hdd_handle;
 
 
 	status = wlan_objmgr_psoc_try_get_ref(psoc, WLAN_LEGACY_MAC_ID);
 	status = wlan_objmgr_psoc_try_get_ref(psoc, WLAN_LEGACY_MAC_ID);
 	if (QDF_IS_STATUS_ERROR(status)) {
 	if (QDF_IS_STATUS_ERROR(status)) {

+ 10 - 9
core/sme/src/common/sme_api.c

@@ -2201,7 +2201,7 @@ QDF_STATUS sme_process_msg(tpAniSirGlobal pMac, struct scheduler_msg *pMsg)
 #ifdef FEATURE_WLAN_EXTSCAN
 #ifdef FEATURE_WLAN_EXTSCAN
 	case eWNI_SME_EXTSCAN_FULL_SCAN_RESULT_IND:
 	case eWNI_SME_EXTSCAN_FULL_SCAN_RESULT_IND:
 		if (pMac->sme.pExtScanIndCb)
 		if (pMac->sme.pExtScanIndCb)
-			pMac->sme.pExtScanIndCb(pMac->hHdd,
+			pMac->sme.pExtScanIndCb(pMac->hdd_handle,
 					eSIR_EXTSCAN_FULL_SCAN_RESULT_IND,
 					eSIR_EXTSCAN_FULL_SCAN_RESULT_IND,
 					pMsg->bodyptr);
 					pMsg->bodyptr);
 		else
 		else
@@ -2212,7 +2212,7 @@ QDF_STATUS sme_process_msg(tpAniSirGlobal pMac, struct scheduler_msg *pMsg)
 		break;
 		break;
 	case eWNI_SME_EPNO_NETWORK_FOUND_IND:
 	case eWNI_SME_EPNO_NETWORK_FOUND_IND:
 		if (pMac->sme.pExtScanIndCb)
 		if (pMac->sme.pExtScanIndCb)
-			pMac->sme.pExtScanIndCb(pMac->hHdd,
+			pMac->sme.pExtScanIndCb(pMac->hdd_handle,
 					eSIR_EPNO_NETWORK_FOUND_IND,
 					eSIR_EPNO_NETWORK_FOUND_IND,
 					pMsg->bodyptr);
 					pMsg->bodyptr);
 		else
 		else
@@ -2313,8 +2313,8 @@ QDF_STATUS sme_process_msg(tpAniSirGlobal pMac, struct scheduler_msg *pMsg)
 		break;
 		break;
 	case eWNI_SME_SET_THERMAL_LEVEL_IND:
 	case eWNI_SME_SET_THERMAL_LEVEL_IND:
 		if (pMac->sme.set_thermal_level_cb)
 		if (pMac->sme.set_thermal_level_cb)
-			pMac->sme.set_thermal_level_cb(pMac->hHdd,
-								pMsg->bodyval);
+			pMac->sme.set_thermal_level_cb(pMac->hdd_handle,
+						       pMsg->bodyval);
 		break;
 		break;
 	case eWNI_SME_EXT_CHANGE_CHANNEL_IND:
 	case eWNI_SME_EXT_CHANGE_CHANNEL_IND:
 		 status = sme_extended_change_channel_ind(pMac, pMsg->bodyptr);
 		 status = sme_extended_change_channel_ind(pMac, pMsg->bodyptr);
@@ -2331,24 +2331,25 @@ QDF_STATUS sme_process_msg(tpAniSirGlobal pMac, struct scheduler_msg *pMsg)
 		break;
 		break;
 	case eWNI_SME_LOST_LINK_INFO_IND:
 	case eWNI_SME_LOST_LINK_INFO_IND:
 		if (pMac->sme.lost_link_info_cb)
 		if (pMac->sme.lost_link_info_cb)
-			pMac->sme.lost_link_info_cb(pMac->hHdd,
+			pMac->sme.lost_link_info_cb(pMac->hdd_handle,
 				(struct sir_lost_link_info *)pMsg->bodyptr);
 				(struct sir_lost_link_info *)pMsg->bodyptr);
 		qdf_mem_free(pMsg->bodyptr);
 		qdf_mem_free(pMsg->bodyptr);
 		break;
 		break;
 	case eWNI_SME_RSO_CMD_STATUS_IND:
 	case eWNI_SME_RSO_CMD_STATUS_IND:
 		if (pMac->sme.rso_cmd_status_cb)
 		if (pMac->sme.rso_cmd_status_cb)
-			pMac->sme.rso_cmd_status_cb(pMac->hHdd, pMsg->bodyptr);
+			pMac->sme.rso_cmd_status_cb(pMac->hdd_handle,
+						    pMsg->bodyptr);
 		qdf_mem_free(pMsg->bodyptr);
 		qdf_mem_free(pMsg->bodyptr);
 		break;
 		break;
 	case eWMI_SME_LL_STATS_IND:
 	case eWMI_SME_LL_STATS_IND:
 		if (pMac->sme.link_layer_stats_ext_cb)
 		if (pMac->sme.link_layer_stats_ext_cb)
-			pMac->sme.link_layer_stats_ext_cb(pMac->hHdd,
+			pMac->sme.link_layer_stats_ext_cb(pMac->hdd_handle,
 							  pMsg->bodyptr);
 							  pMsg->bodyptr);
 		qdf_mem_free(pMsg->bodyptr);
 		qdf_mem_free(pMsg->bodyptr);
 		break;
 		break;
 	case eWNI_SME_BT_ACTIVITY_INFO_IND:
 	case eWNI_SME_BT_ACTIVITY_INFO_IND:
 		if (pMac->sme.bt_activity_info_cb)
 		if (pMac->sme.bt_activity_info_cb)
-			pMac->sme.bt_activity_info_cb(pMac->hHdd,
+			pMac->sme.bt_activity_info_cb(pMac->hdd_handle,
 						      pMsg->bodyval);
 						      pMsg->bodyval);
 		break;
 		break;
 	default:
 	default:
@@ -10784,7 +10785,7 @@ static QDF_STATUS sme_stats_ext_event(tpAniSirGlobal mac,
 	}
 	}
 
 
 	if (mac->sme.StatsExtCallback)
 	if (mac->sme.StatsExtCallback)
-		mac->sme.StatsExtCallback(mac->hHdd, msg);
+		mac->sme.StatsExtCallback(mac->hdd_handle, msg);
 
 
 	return QDF_STATUS_SUCCESS;
 	return QDF_STATUS_SUCCESS;
 }
 }

+ 2 - 2
core/sme/src/nan/nan_api.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-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
@@ -137,7 +137,7 @@ QDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg)
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  FL("SME: Received sme_nan_event"));
 			  FL("SME: Received sme_nan_event"));
 		if (pMac->sme.nanCallback) {
 		if (pMac->sme.nanCallback) {
-			pMac->sme.nanCallback(pMac->hHdd,
+			pMac->sme.nanCallback(pMac->hdd_handle,
 					      (tSirNanEvent *) pMsg);
 					      (tSirNanEvent *) pMsg);
 		}
 		}
 	}
 	}

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

@@ -4671,7 +4671,7 @@ int wma_apf_read_work_memory_event_handler(void *handle, uint8_t *evt_buf,
 		return -EINVAL;
 		return -EINVAL;
 	}
 	}
 
 
-	pmac->sme.apf_read_mem_cb(pmac->hHdd, &evt_params);
+	pmac->sme.apf_read_mem_cb(pmac->hdd_handle, &evt_params);
 
 
 	return 0;
 	return 0;
 }
 }
@@ -5120,7 +5120,7 @@ int wma_p2p_lo_event_handler(void *handle, uint8_t *event_buf,
 	event->vdev_id = fix_param->vdev_id;
 	event->vdev_id = fix_param->vdev_id;
 	event->reason_code = fix_param->reason;
 	event->reason_code = fix_param->reason;
 
 
-	p_mac->sme.p2p_lo_event_callback(p_mac->hHdd, event);
+	p_mac->sme.p2p_lo_event_callback(p_mac->hdd_handle, event);
 
 
 	wma->interfaces[event->vdev_id].p2p_lo_in_progress = false;
 	wma->interfaces[event->vdev_id].p2p_lo_in_progress = false;
 
 
@@ -5453,7 +5453,7 @@ int wma_get_arp_stats_handler(void *handle, uint8_t *data,
 			connect_stats_event->icmpv4_rsp_recvd);
 			connect_stats_event->icmpv4_rsp_recvd);
 	}
 	}
 
 
-	mac->sme.get_arp_stats_cb(mac->hHdd, &rsp,
+	mac->sme.get_arp_stats_cb(mac->hdd_handle, &rsp,
 				  mac->sme.get_arp_stats_context);
 				  mac->sme.get_arp_stats_context);
 
 
 	return 0;
 	return 0;
@@ -5708,7 +5708,7 @@ int wma_rx_aggr_failure_event_handler(void *handle, u_int8_t *event_buf,
 		hole_info++;
 		hole_info++;
 	}
 	}
 
 
-	mac->sme.stats_ext2_cb(mac->hHdd, rx_aggr_hole_event);
+	mac->sme.stats_ext2_cb(mac->hdd_handle, rx_aggr_hole_event);
 	qdf_mem_free(rx_aggr_hole_event);
 	qdf_mem_free(rx_aggr_hole_event);
 
 
 	return 0;
 	return 0;

+ 1 - 1
core/wma/src/wma_mgmt.c

@@ -2957,7 +2957,7 @@ void wma_beacon_miss_handler(tp_wma_handle wma, uint32_t vdev_id, int32_t rssi)
 		return;
 		return;
 	}
 	}
 	if (mac && mac->sme.tx_queue_cb)
 	if (mac && mac->sme.tx_queue_cb)
-		mac->sme.tx_queue_cb(mac->hHdd, vdev_id,
+		mac->sme.tx_queue_cb(mac->hdd_handle, vdev_id,
 				     WLAN_STOP_ALL_NETIF_QUEUE,
 				     WLAN_STOP_ALL_NETIF_QUEUE,
 				     WLAN_CONTROL_PATH);
 				     WLAN_CONTROL_PATH);
 	beacon_miss_ind->messageType = WMA_MISSED_BEACON_IND;
 	beacon_miss_ind->messageType = WMA_MISSED_BEACON_IND;

+ 10 - 10
core/wma/src/wma_scan_roam.c

@@ -2856,7 +2856,7 @@ int wma_rssi_breached_event_handler(void *handle,
 		rssi.request_id, rssi.session_id, rssi.curr_rssi);
 		rssi.request_id, rssi.session_id, rssi.curr_rssi);
 	WMA_LOGI("%s: curr_bssid: %pM", __func__, rssi.curr_bssid.bytes);
 	WMA_LOGI("%s: curr_bssid: %pM", __func__, rssi.curr_bssid.bytes);
 
 
-	mac->sme.rssi_threshold_breached_cb(mac->hHdd, &rssi);
+	mac->sme.rssi_threshold_breached_cb(mac->hdd_handle, &rssi);
 	WMA_LOGD("%s: Invoke HDD rssi breached callback", __func__);
 	WMA_LOGD("%s: Invoke HDD rssi breached callback", __func__);
 	return 0;
 	return 0;
 }
 }
@@ -3446,7 +3446,7 @@ int wma_extscan_start_stop_event_handler(void *handle,
 		qdf_mem_free(extscan_ind);
 		qdf_mem_free(extscan_ind);
 		return -EINVAL;
 		return -EINVAL;
 	}
 	}
-	pMac->sme.pExtScanIndCb(pMac->hHdd, event_type, extscan_ind);
+	pMac->sme.pExtScanIndCb(pMac->hdd_handle, event_type, extscan_ind);
 	WMA_LOGD("%s: sending event to umac for requestid %u with status %d",
 	WMA_LOGD("%s: sending event to umac for requestid %u with status %d",
 		__func__, extscan_ind->request_id, extscan_ind->status);
 		__func__, extscan_ind->request_id, extscan_ind->status);
 	qdf_mem_free(extscan_ind);
 	qdf_mem_free(extscan_ind);
@@ -3563,7 +3563,7 @@ int wma_extscan_operations_event_handler(void *handle,
 		qdf_mem_free(oprn_ind);
 		qdf_mem_free(oprn_ind);
 		return -EINVAL;
 		return -EINVAL;
 	}
 	}
-	pMac->sme.pExtScanIndCb(pMac->hHdd,
+	pMac->sme.pExtScanIndCb(pMac->hdd_handle,
 				eSIR_EXTSCAN_SCAN_PROGRESS_EVENT_IND, oprn_ind);
 				eSIR_EXTSCAN_SCAN_PROGRESS_EVENT_IND, oprn_ind);
 	WMA_LOGI("%s: sending scan progress event to hdd", __func__);
 	WMA_LOGI("%s: sending scan progress event to hdd", __func__);
 exit_handler:
 exit_handler:
@@ -3613,7 +3613,7 @@ int wma_extscan_table_usage_event_handler(void *handle,
 	}
 	}
 	tbl_usg_ind->requestId = event->request_id;
 	tbl_usg_ind->requestId = event->request_id;
 	tbl_usg_ind->numResultsAvailable = event->entries_in_use;
 	tbl_usg_ind->numResultsAvailable = event->entries_in_use;
-	pMac->sme.pExtScanIndCb(pMac->hHdd,
+	pMac->sme.pExtScanIndCb(pMac->hdd_handle,
 				eSIR_EXTSCAN_SCAN_RES_AVAILABLE_IND,
 				eSIR_EXTSCAN_SCAN_RES_AVAILABLE_IND,
 				tbl_usg_ind);
 				tbl_usg_ind);
 	WMA_LOGI("%s: sending scan_res available event to hdd", __func__);
 	WMA_LOGI("%s: sending scan_res available event to hdd", __func__);
@@ -3720,7 +3720,7 @@ int wma_extscan_capabilities_event_handler(void *handle,
 		__func__, dest_capab->max_number_of_white_listed_ssid,
 		__func__, dest_capab->max_number_of_white_listed_ssid,
 		dest_capab->max_number_of_black_listed_bssid);
 		dest_capab->max_number_of_black_listed_bssid);
 
 
-	pMac->sme.pExtScanIndCb(pMac->hHdd,
+	pMac->sme.pExtScanIndCb(pMac->hdd_handle,
 				eSIR_EXTSCAN_GET_CAPABILITIES_IND, dest_capab);
 				eSIR_EXTSCAN_GET_CAPABILITIES_IND, dest_capab);
 	qdf_mem_free(dest_capab);
 	qdf_mem_free(dest_capab);
 	return 0;
 	return 0;
@@ -3840,7 +3840,7 @@ int wma_extscan_hotlist_match_event_handler(void *handle,
 		src_hotlist++;
 		src_hotlist++;
 	}
 	}
 	dest_hotlist->ap_found = ap_found;
 	dest_hotlist->ap_found = ap_found;
-	pMac->sme.pExtScanIndCb(pMac->hHdd,
+	pMac->sme.pExtScanIndCb(pMac->hdd_handle,
 				eSIR_EXTSCAN_HOTLIST_MATCH_IND, dest_hotlist);
 				eSIR_EXTSCAN_HOTLIST_MATCH_IND, dest_hotlist);
 	WMA_LOGI("%s: sending hotlist match event to hdd", __func__);
 	WMA_LOGI("%s: sending hotlist match event to hdd", __func__);
 	qdf_mem_free(dest_hotlist);
 	qdf_mem_free(dest_hotlist);
@@ -4149,7 +4149,7 @@ int wma_extscan_cached_results_event_handler(void *handle,
 
 
 	status = wma_group_num_bss_to_scan_id(cmd_param_info, dest_cachelist);
 	status = wma_group_num_bss_to_scan_id(cmd_param_info, dest_cachelist);
 	if (!status)
 	if (!status)
-	pMac->sme.pExtScanIndCb(pMac->hHdd,
+	pMac->sme.pExtScanIndCb(pMac->hdd_handle,
 				eSIR_EXTSCAN_CACHED_RESULTS_IND,
 				eSIR_EXTSCAN_CACHED_RESULTS_IND,
 				dest_cachelist);
 				dest_cachelist);
 	else
 	else
@@ -4170,7 +4170,7 @@ noresults:
 	empty_cachelist.more_data = 0;
 	empty_cachelist.more_data = 0;
 	empty_cachelist.num_scan_ids = 0;
 	empty_cachelist.num_scan_ids = 0;
 
 
-	pMac->sme.pExtScanIndCb(pMac->hHdd,
+	pMac->sme.pExtScanIndCb(pMac->hdd_handle,
 				eSIR_EXTSCAN_CACHED_RESULTS_IND,
 				eSIR_EXTSCAN_CACHED_RESULTS_IND,
 				&empty_cachelist);
 				&empty_cachelist);
 	return 0;
 	return 0;
@@ -4312,7 +4312,7 @@ int wma_extscan_change_results_event_handler(void *handle,
 	dest_chglist->moreData = moredata;
 	dest_chglist->moreData = moredata;
 	dest_chglist->numResults = numap;
 	dest_chglist->numResults = numap;
 
 
-	pMac->sme.pExtScanIndCb(pMac->hHdd,
+	pMac->sme.pExtScanIndCb(pMac->hdd_handle,
 			eSIR_EXTSCAN_SIGNIFICANT_WIFI_CHANGE_RESULTS_IND,
 			eSIR_EXTSCAN_SIGNIFICANT_WIFI_CHANGE_RESULTS_IND,
 			dest_chglist);
 			dest_chglist);
 	WMA_LOGI("%s: sending change monitor results", __func__);
 	WMA_LOGI("%s: sending change monitor results", __func__);
@@ -4425,7 +4425,7 @@ int wma_passpoint_match_event_handler(void *handle,
 			WMI_TLV_HDR_SIZE + dest_ap->ieLength,
 			WMI_TLV_HDR_SIZE + dest_ap->ieLength,
 			dest_match->anqp_len);
 			dest_match->anqp_len);
 
 
-	mac->sme.pExtScanIndCb(mac->hHdd,
+	mac->sme.pExtScanIndCb(mac->hdd_handle,
 				eSIR_PASSPOINT_NETWORK_FOUND_IND,
 				eSIR_PASSPOINT_NETWORK_FOUND_IND,
 				dest_match);
 				dest_match);
 	WMA_LOGI("%s: sending passpoint match event to hdd", __func__);
 	WMA_LOGI("%s: sending passpoint match event to hdd", __func__);

+ 1 - 1
core/wma/src/wma_twt.c

@@ -67,7 +67,7 @@ int wma_twt_en_complete_event_handler(void *handle,
 	WMA_LOGD("TWT: Received TWT enable comp event, status:%d", status);
 	WMA_LOGD("TWT: Received TWT enable comp event, status:%d", status);
 
 
 	if (mac->sme.twt_enable_cb)
 	if (mac->sme.twt_enable_cb)
-		mac->sme.twt_enable_cb(mac->hHdd, &param);
+		mac->sme.twt_enable_cb(mac->hdd_handle, &param);
 
 
 	return status;
 	return status;
 }
 }

+ 6 - 6
core/wma/src/wma_utils.c

@@ -1375,7 +1375,7 @@ static int wma_unified_link_peer_stats_event_handler(void *handle,
 	 * vdev_id/ifacId in link_stats_results will be
 	 * vdev_id/ifacId in link_stats_results will be
 	 * used to retrieve the correct HDD context
 	 * used to retrieve the correct HDD context
 	 */
 	 */
-	pMac->sme.pLinkLayerStatsIndCallback(pMac->hHdd,
+	pMac->sme.pLinkLayerStatsIndCallback(pMac->hdd_handle,
 					     WMA_LINK_LAYER_STATS_RESULTS_RSP,
 					     WMA_LINK_LAYER_STATS_RESULTS_RSP,
 					     link_stats_results);
 					     link_stats_results);
 	qdf_mem_free(link_stats_results);
 	qdf_mem_free(link_stats_results);
@@ -1571,7 +1571,7 @@ post_stats:
 	 * vdev_id/ifacId in link_stats_results will be
 	 * vdev_id/ifacId in link_stats_results will be
 	 * used to retrieve the correct HDD context
 	 * used to retrieve the correct HDD context
 	 */
 	 */
-	mac->sme.pLinkLayerStatsIndCallback(mac->hHdd,
+	mac->sme.pLinkLayerStatsIndCallback(mac->hdd_handle,
 		WMA_LINK_LAYER_STATS_RESULTS_RSP,
 		WMA_LINK_LAYER_STATS_RESULTS_RSP,
 		link_stats_results);
 		link_stats_results);
 	wma_unified_radio_tx_mem_free(handle);
 	wma_unified_radio_tx_mem_free(handle);
@@ -1779,7 +1779,7 @@ static int wma_unified_link_radio_stats_event_handler(void *handle,
 		return 0;
 		return 0;
 	}
 	}
 
 
-	pMac->sme.pLinkLayerStatsIndCallback(pMac->hHdd,
+	pMac->sme.pLinkLayerStatsIndCallback(pMac->hdd_handle,
 					     WMA_LINK_LAYER_STATS_RESULTS_RSP,
 					     WMA_LINK_LAYER_STATS_RESULTS_RSP,
 					     link_stats_results);
 					     link_stats_results);
 	wma_unified_radio_tx_mem_free(handle);
 	wma_unified_radio_tx_mem_free(handle);
@@ -2204,7 +2204,7 @@ int wma_unified_link_iface_stats_event_handler(void *handle,
 	 * vdev_id/ifacId in link_stats_results will be
 	 * vdev_id/ifacId in link_stats_results will be
 	 * used to retrieve the correct HDD context
 	 * used to retrieve the correct HDD context
 	 */
 	 */
-	pMac->sme.pLinkLayerStatsIndCallback(pMac->hHdd,
+	pMac->sme.pLinkLayerStatsIndCallback(pMac->hdd_handle,
 					     WMA_LINK_LAYER_STATS_RESULTS_RSP,
 					     WMA_LINK_LAYER_STATS_RESULTS_RSP,
 					     link_stats_results);
 					     link_stats_results);
 	qdf_mem_free(link_stats_results);
 	qdf_mem_free(link_stats_results);
@@ -3186,7 +3186,7 @@ int wma_stats_event_handler(void *handle, uint8_t *cmd_param_info,
 			}
 			}
 			WMA_LOGI("%s: congestion %d", __func__,
 			WMA_LOGI("%s: congestion %d", __func__,
 				congestion_stats->congestion);
 				congestion_stats->congestion);
-			mac->sme.congestion_cb(mac->hHdd,
+			mac->sme.congestion_cb(mac->hdd_handle,
 				congestion_stats->congestion,
 				congestion_stats->congestion,
 				congestion_stats->vdev_id);
 				congestion_stats->vdev_id);
 		}
 		}
@@ -4611,7 +4611,7 @@ int wma_chip_power_save_failure_detected_handler(void *handle,
 				event->protocol_wake_lock_bitmap[2];
 				event->protocol_wake_lock_bitmap[2];
 	pwr_save_fail_params.wake_lock_bitmap[3] =
 	pwr_save_fail_params.wake_lock_bitmap[3] =
 				event->protocol_wake_lock_bitmap[3];
 				event->protocol_wake_lock_bitmap[3];
-	mac->sme.chip_power_save_fail_cb(mac->hHdd,
+	mac->sme.chip_power_save_fail_cb(mac->hdd_handle,
 				&pwr_save_fail_params);
 				&pwr_save_fail_params);
 
 
 	WMA_LOGD("%s: Invoke HDD pwr_save_fail callback", __func__);
 	WMA_LOGD("%s: Invoke HDD pwr_save_fail callback", __func__);