samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Fix nan_release_cmd

Browse Source 
Fix nan_release_cmd to take serialization command type.

Change-Id: I1f8ba74b4630c03dacda3bf294526a0f066d3c32
CRs-Fixed: 2137432
This commit is contained in:
Naveen Rawat
2017-11-02 17:06:57 -07:00
committed by snandini
parent 616d1309d2
commit 92e3c10b45
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
umac/nan/core/src/nan_main.c
View File

@@ -60,15 +60,15 @@ struct nan_psoc_priv_obj *nan_get_psoc_priv_obj(
return obj; return obj;
} }
void nan_release_cmd(void *in_req, uint32_t req_type) void nan_release_cmd(void *in_req, uint32_t cmdtype)
{ {
struct wlan_objmgr_vdev *vdev = NULL; struct wlan_objmgr_vdev *vdev = NULL;
if (!in_req) if (!in_req)
return; return;
switch (req_type) { switch (cmdtype) {
case NDP_INITIATOR_REQ: { case WLAN_SER_CMD_NDP_INIT_REQ: {
struct nan_datapath_initiator_req *req = in_req; struct nan_datapath_initiator_req *req = in_req;
vdev = req->vdev; vdev = req->vdev;
qdf_mem_free(req->pmk.pmk); qdf_mem_free(req->pmk.pmk);
@@ -78,7 +78,7 @@ void nan_release_cmd(void *in_req, uint32_t req_type)
qdf_mem_free(req->service_name.service_name); qdf_mem_free(req->service_name.service_name);
break; break;
} }
case NDP_RESPONDER_REQ: { case WLAN_SER_CMD_NDP_RESP_REQ: {
struct nan_datapath_responder_req *req = in_req; struct nan_datapath_responder_req *req = in_req;
vdev = req->vdev; vdev = req->vdev;
qdf_mem_free(req->pmk.pmk); qdf_mem_free(req->pmk.pmk);
@@ -88,14 +88,14 @@ void nan_release_cmd(void *in_req, uint32_t req_type)
qdf_mem_free(req->service_name.service_name); qdf_mem_free(req->service_name.service_name);
break; break;
} }
case NDP_END_REQ: { case WLAN_SER_CMD_NDP_DATA_END_INIT_REQ: {
struct nan_datapath_end_req *req = in_req; struct nan_datapath_end_req *req = in_req;
vdev = req->vdev; vdev = req->vdev;
qdf_mem_free(req->ndp_ids); qdf_mem_free(req->ndp_ids);
break; break;
} }
default: default:
nan_err("invalid req type: %d", req_type); nan_err("invalid req type: %d", cmdtype);
break; break;
} }
@@ -245,6 +245,7 @@ QDF_STATUS nan_scheduled_msg_handler(struct scheduler_msg *msg)
cmd.source = WLAN_UMAC_COMP_NAN; cmd.source = WLAN_UMAC_COMP_NAN;
cmd.is_high_priority = false; cmd.is_high_priority = false;
cmd.cmd_timeout_duration = 30000 /* 30 sec for now. TBD */; cmd.cmd_timeout_duration = 30000 /* 30 sec for now. TBD */;
nan_debug("cmd_type: %d", cmd.cmd_type);
status = wlan_serialization_request(&cmd); status = wlan_serialization_request(&cmd);
/* following is TBD */ /* following is TBD */