Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c195a424 authored by Santosh Anbu's avatar Santosh Anbu Committed by Rajeev Kumar Sirasanagandla
Browse files

qcacmn: Fix type for wlan_serialization_cmd_callback 

Fix the type for nan_serialized_cb and remove unnecessary
type casts from other callbacks.

Change-Id: Ie4e45f5a7e9fc17eb1c45fa18160e3bbd47151fe
CRs-Fixed: 2402989
parent b0dd3ec8

umac/cmn_services/serialization/inc/wlan_serialization_api.h

+5 −2
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ union wlan_serialization_rules_info { 
	struct wlan_serialization_scan_info scan_info;

};



struct wlan_serialization_command;



/**

 * wlan_serialization_cmd_callback() - Callback registered by the component

 * @wlan_cmd: Command passed by the component for serialization
@@ -89,7 +91,8 @@ union wlan_serialization_rules_info { 
 *

 * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE

 */

typedef QDF_STATUS (*wlan_serialization_cmd_callback) (void *wlan_cmd,

typedef QDF_STATUS

(*wlan_serialization_cmd_callback)(struct wlan_serialization_command *wlan_cmd,

				   enum wlan_serialization_cb_reason reason);



/**

umac/nan/core/src/nan_main.c

+2 −3
Original line number Diff line number Diff line
@@ -153,11 +153,10 @@ static void nan_req_activated(void *in_req, uint32_t cmdtype) 
	tx_ops->nan_req_tx(in_req, req_type);

}



static QDF_STATUS nan_serialized_cb(void *cmd,

static QDF_STATUS nan_serialized_cb(struct wlan_serialization_command *ser_cmd,

				    enum wlan_serialization_cb_reason reason)

{

	void *req;

	struct wlan_serialization_command *ser_cmd = cmd;



	if (!ser_cmd || !ser_cmd->umac_cmd) {

		nan_alert("cmd or umac_cmd is null");

umac/scan/core/src/wlan_scan_manager.c

+1 −2
Original line number Diff line number Diff line
@@ -418,8 +418,7 @@ scm_scan_start_req(struct scheduler_msg *msg) 


	cmd.cmd_type = WLAN_SER_CMD_SCAN;

	cmd.cmd_id = req->scan_req.scan_id;

	cmd.cmd_cb = (wlan_serialization_cmd_callback)

		scm_scan_serialize_callback;

	cmd.cmd_cb = scm_scan_serialize_callback;

	cmd.umac_cmd = req;

	cmd.source = WLAN_UMAC_COMP_SCAN;

	cmd.is_high_priority = false;

umac/tdls/core/src/wlan_tdls_cmds_process.c

+3 −6
Original line number Diff line number Diff line
@@ -817,8 +817,7 @@ QDF_STATUS tdls_process_add_peer(struct tdls_add_peer_request *req) 
	vdev = req->vdev;

	cmd.cmd_type = WLAN_SER_CMD_TDLS_ADD_PEER;

	cmd.cmd_id = 0;

	cmd.cmd_cb = (wlan_serialization_cmd_callback)

		tdls_add_peer_serialize_callback;

	cmd.cmd_cb = tdls_add_peer_serialize_callback;

	cmd.umac_cmd = req;

	cmd.source = WLAN_UMAC_COMP_TDLS;

	cmd.is_high_priority = false;
@@ -1032,8 +1031,7 @@ QDF_STATUS tdls_process_update_peer(struct tdls_update_peer_request *req) 
	vdev = req->vdev;

	cmd.cmd_type = WLAN_SER_CMD_TDLS_ADD_PEER;

	cmd.cmd_id = 0;

	cmd.cmd_cb = (wlan_serialization_cmd_callback)

		tdls_update_peer_serialize_callback;

	cmd.cmd_cb = tdls_update_peer_serialize_callback;

	cmd.umac_cmd = req;

	cmd.source = WLAN_UMAC_COMP_TDLS;

	cmd.is_high_priority = false;
@@ -1185,8 +1183,7 @@ QDF_STATUS tdls_process_del_peer(struct tdls_oper_request *req) 


	cmd.cmd_type = WLAN_SER_CMD_TDLS_DEL_PEER;

	cmd.cmd_id = 0;

	cmd.cmd_cb = (wlan_serialization_cmd_callback)

		tdls_del_peer_serialize_callback;

	cmd.cmd_cb = tdls_del_peer_serialize_callback;

	cmd.umac_cmd = req;

	cmd.source = WLAN_UMAC_COMP_TDLS;

	cmd.is_high_priority = false;

umac/tdls/core/src/wlan_tdls_mgmt.c

+1 −2
Original line number Diff line number Diff line
@@ -410,8 +410,7 @@ QDF_STATUS tdls_process_mgmt_req( 
	cmd.cmd_type = WLAN_SER_CMD_TDLS_SEND_MGMT;

	/* Cmd Id not applicable for non scan cmds */

	cmd.cmd_id = 0;

	cmd.cmd_cb = (wlan_serialization_cmd_callback)

		tdls_send_mgmt_serialize_callback;

	cmd.cmd_cb = tdls_send_mgmt_serialize_callback;

	cmd.umac_cmd = tdls_mgmt_req;

	cmd.source = WLAN_UMAC_COMP_TDLS;

	cmd.is_high_priority = false;