A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-24 05:29:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Pass correct pointer type to mac_open()

Browse source 
In cds_open() the call to mac_open() currently passes a pointer to the
gp_cds_context->mac_context field. This is a void * field but
mac_open() expects a mac_handle_t * (aka tHalHandle *). This currently
compiles because mac_handle_t is itself a void *. But in the future
the underlying type of mac_handle_t will change, so pass a pointer to
an object of the correct type to mac_open().

Change-Id: Ie3e54c5288bc7d1e9287f30d997b005a5c8dc2ef
CRs-Fixed: 2268813
This commit is contained in:
Jeff Johnson 2018-06-11 09:57:09 -07:00 • committed by nshrivas
commit ec56395f88
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/cds/src/cds_api.c
View file

@ -457,6 +457,7 @@ QDF_STATUS cds_open(struct wlan_objmgr_psoc *psoc)
void *HTCHandle;
struct hdd_context *hdd_ctx;
struct cds_context *cds_ctx;
mac_handle_t mac_handle;
cds_debug("Opening CDS");
@ -631,7 +632,7 @@ QDF_STATUS cds_open(struct wlan_objmgr_psoc *psoc)
bmi_target_ready(scn, gp_cds_context->cfg_ctx);
/* Now proceed to open the MAC */
status = mac_open(psoc, &(gp_cds_context->mac_context),
status = mac_open(psoc, &mac_handle,
gp_cds_context->hdd_context, cds_cfg);
if (QDF_STATUS_SUCCESS != status) {
@ -640,9 +641,10 @@ QDF_STATUS cds_open(struct wlan_objmgr_psoc *psoc)
QDF_ASSERT(0);
goto err_soc_detach;
}
gp_cds_context->mac_context = mac_handle;
/* Now proceed to open the SME */
status = sme_open(gp_cds_context->mac_context);
status = sme_open(mac_handle);
if (QDF_IS_STATUS_ERROR(status)) {
/* Critical Error ... Cannot proceed further */
cds_alert("Failed to open SME");
@ -655,7 +657,7 @@ QDF_STATUS cds_open(struct wlan_objmgr_psoc *psoc)
return dispatcher_psoc_open(psoc);
err_mac_close:
mac_close(gp_cds_context->mac_context);
mac_close(mac_handle);
err_soc_detach:
/* todo: add propper error handling */