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

qcacld-3.0: Update nan_discovery_flush_callback

Browse Source 
Update return type of nan_discovery_flush_callback to return
QDF_STATUS to match scheduler_msg_process_fn_t.

Change-Id: I3a2c32beaff471ed3a2e8e3956292257e074cd50
CRs-fixed: 2698305
This commit is contained in:
Lincoln Tran
2020-05-19 16:14:55 -07:00
committed by nshrivas
parent 498953e600
commit aa5716f95f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/nan/core/src/nan_main.c
View File

@@ -1259,13 +1259,13 @@ static QDF_STATUS nan_discovery_generic_req(struct nan_generic_req *req)
return tx_ops->nan_discovery_req_tx(req, NAN_GENERIC_REQ); return tx_ops->nan_discovery_req_tx(req, NAN_GENERIC_REQ);
} }
void nan_discovery_flush_callback(struct scheduler_msg *msg) QDF_STATUS nan_discovery_flush_callback(struct scheduler_msg *msg)
{ {
struct wlan_objmgr_psoc *psoc; struct wlan_objmgr_psoc *psoc;
if (!msg || !msg->bodyptr) { if (!msg || !msg->bodyptr) {
nan_err("Null pointer for NAN Discovery message"); nan_err("Null pointer for NAN Discovery message");
return; return QDF_STATUS_E_INVAL;
} }
switch (msg->type) { switch (msg->type) {
@@ -1281,11 +1281,13 @@ void nan_discovery_flush_callback(struct scheduler_msg *msg)
default: default:
nan_err("Unsupported request type: %d", msg->type); nan_err("Unsupported request type: %d", msg->type);
qdf_mem_free(msg->bodyptr); qdf_mem_free(msg->bodyptr);
return; return QDF_STATUS_E_INVAL;
} }
wlan_objmgr_psoc_release_ref(psoc, WLAN_NAN_ID); wlan_objmgr_psoc_release_ref(psoc, WLAN_NAN_ID);
qdf_mem_free(msg->bodyptr); qdf_mem_free(msg->bodyptr);
return QDF_STATUS_SUCCESS;
} }
QDF_STATUS nan_discovery_scheduled_handler(struct scheduler_msg *msg) QDF_STATUS nan_discovery_scheduled_handler(struct scheduler_msg *msg)

4
components/nan/core/src/nan_main_i.h
View File

@@ -186,9 +186,9 @@ QDF_STATUS nan_scheduled_msg_handler(struct scheduler_msg *msg);
* nan_discovery_flush_callback: callback to flush the NAN scheduler msg * nan_discovery_flush_callback: callback to flush the NAN scheduler msg
* @msg: pointer to msg * @msg: pointer to msg
* *
* Return: None * Return: QDF_STATUS
*/ */
void nan_discovery_flush_callback(struct scheduler_msg *msg); QDF_STATUS nan_discovery_flush_callback(struct scheduler_msg *msg);
/** /**
* nan_discovery_scheduled_handler: callback pointer to be called when scheduler * nan_discovery_scheduled_handler: callback pointer to be called when scheduler