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

qcacmn: Fix return type for scheduler_msg callbacks

Browse Source 
This fixes a CFI failure in callback assignment

Change-Id: I760b41b81c006187efb162d410390e1c11878b82
CRs-Fixed: 2643320
This commit is contained in:
Bapiraju Alla
2020-03-25 10:31:07 +05:30
committed by nshrivas
parent dfbe7d4fd0
commit acf898a145
5 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
target_if/mlme/vdev_mgr/inc/target_if_vdev_mgr_rx_ops.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -152,8 +152,9 @@ QDF_STATUS target_if_vdev_mgr_wmi_event_unregister(
* target_if_vdev_mgr_rsp_timer_cb() - function to handle vdev related timeouts
* @vdev_rsp: pointer to vdev response timer
*
* Return: NONE
* Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on error
*/
void target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp);
QDF_STATUS
target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp);
#endif /* __TARGET_IF_VDEV_MGR_RX_OPS_H__ */

18
target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c
View File

@@ -32,7 +32,7 @@
#include <wlan_vdev_mlme_main.h>
#include <wmi_unified_vdev_api.h>
void target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp)
QDF_STATUS target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp)
{
struct wlan_objmgr_psoc *psoc;
struct wlan_lmac_if_mlme_rx_ops *rx_ops;
@@ -46,19 +46,19 @@ void target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp)
if (!vdev_rsp) {
mlme_err("Vdev response timer is NULL");
return;
return QDF_STATUS_E_FAILURE;
}
psoc = vdev_rsp->psoc;
if (!psoc) {
mlme_err("PSOC is NULL");
return;
return QDF_STATUS_E_FAILURE;
}
rx_ops = target_if_vdev_mgr_get_rx_ops(psoc);
if (!rx_ops || !rx_ops->psoc_get_vdev_response_timer_info) {
mlme_err("No Rx Ops");
return;
return QDF_STATUS_E_FAILURE;
}
if (!qdf_atomic_test_bit(START_RESPONSE_BIT, &vdev_rsp->rsp_status) &&
@@ -70,14 +70,14 @@ void target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp)
&vdev_rsp->rsp_status)) {
mlme_debug("No response bit is set, ignoring actions :%d",
vdev_rsp->vdev_id);
return;
return QDF_STATUS_E_FAILURE;
}
vdev_id = vdev_rsp->vdev_id;
if (vdev_id >= WLAN_UMAC_PSOC_MAX_VDEVS) {
mlme_err("Invalid VDEV_%d PSOC_%d", vdev_id,
wlan_psoc_get_id(psoc));
return;
return QDF_STATUS_E_FAILURE;
}
vdev_rsp->timer_status = QDF_STATUS_E_TIMEOUT;
@@ -132,13 +132,13 @@ void target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp)
} else {
mlme_err("PSOC_%d VDEV_%d: Unknown error",
wlan_psoc_get_id(psoc), vdev_id);
return;
return QDF_STATUS_E_FAILURE;
}
if (!target_if_vdev_mgr_is_panic_allowed()) {
mlme_debug("PSOC_%d VDEV_%d: Panic not allowed",
wlan_psoc_get_id(psoc), vdev_id);
return;
return QDF_STATUS_SUCCESS;
}
/* Trigger recovery */
@@ -147,6 +147,8 @@ void target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp)
string_from_rsp_bit(rsp_pos));
qdf_trigger_self_recovery(psoc, recovery_reason);
return QDF_STATUS_SUCCESS;
}
#ifdef SERIALIZE_VDEV_RESP