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

qcacld-3.0: Fix Vdev start failure handling in SAP and STA

Browse Source 
Vdev start failure handling in SAP and STA and not handled
properly and thus VDEV SM doesn't move to INIT state and
lead to asserts.

Change-Id: I5ea09f9c6e84a2e1c7f9254319aaa1a11e2f97e8
CRs-Fixed: 2526179
This commit is contained in:
Abhishek Singh
2019-09-12 09:07:36 +05:30
committed by Gerrit - the friendly Code Review server
parent c5d794568c
commit 7a4d17a2de
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/wma/inc/wma_internal.h
View File

@@ -1574,6 +1574,16 @@ void wma_send_vdev_down(tp_wma_handle wma, struct del_bss_resp *req);
int wma_cold_boot_cal_event_handler(void *wma_ctx, uint8_t *event_buff,
uint32_t len);
/**
* wma_handle_channel_switch_resp() - handle channel switch resp
* @wma: wma handle
* @rsp: response for channel switch
*
* Return: QDF_STATUS
*/
QDF_STATUS wma_handle_channel_switch_resp(tp_wma_handle wma,
struct vdev_start_response *rsp);
/**
* wma_set_roam_triggers() - Send roam trigger bitmap to WMI
* @wma_handle: wma handle

13
core/wma/src/wma_dev_if.c
View File

@@ -1025,17 +1025,8 @@ static void wma_handle_hidden_ssid_restart(tp_wma_handle wma,
0, NULL);
}
/**
* wma_handle_channel_switch_resp() - handle channel switch resp
* @wma: wma handle
* @resp_event: response from firmware
* @req: target req
*
* Return: QDF_STATUS
*/
static QDF_STATUS
wma_handle_channel_switch_resp(tp_wma_handle wma,
struct vdev_start_response *rsp)
QDF_STATUS wma_handle_channel_switch_resp(tp_wma_handle wma,
struct vdev_start_response *rsp)
{
enum wlan_vdev_sm_evt event;
struct wma_txrx_node *iface;

3
core/wma/src/wma_scan_roam.c
View File

@@ -3639,7 +3639,8 @@ send_resp:
__func__, status);
rsp.status = status;
rsp.vdev_id = vdev_id;
lim_process_switch_channel_rsp(wma->mac_context, &rsp);
wma_handle_channel_switch_resp(wma, &rsp);
}
#ifdef FEATURE_WLAN_ESE

20
core/wma/src/wma_utils.c
View File

@@ -4127,12 +4127,15 @@ wma_mlme_vdev_notify_down_complete(struct vdev_mlme_obj *vdev_mlme,
uint32_t vdev_stop_type;
struct del_bss_resp *resp = (struct del_bss_resp *)data;
if (mlme_is_connection_fail(vdev_mlme->vdev)) {
if (mlme_is_connection_fail(vdev_mlme->vdev) ||
mlme_get_vdev_start_failed(vdev_mlme->vdev)) {
WMA_LOGD("%s Vdev start req failed, no action required",
__func__);
mlme_set_connection_fail(vdev_mlme->vdev, false);
mlme_set_vdev_start_failed(vdev_mlme->vdev, false);
return QDF_STATUS_SUCCESS;
}
wma = cds_get_context(QDF_MODULE_ID_WMA);
if (!wma) {
WMA_LOGE("%s wma handle is NULL", __func__);
@@ -4155,17 +4158,12 @@ wma_mlme_vdev_notify_down_complete(struct vdev_mlme_obj *vdev_mlme,
return QDF_STATUS_SUCCESS;
}
if (!mlme_get_vdev_start_failed(vdev_mlme->vdev)) {
if (vdev_stop_type == WMA_SET_LINK_STATE) {
lim_join_result_callback(
wma->mac_context,
wlan_vdev_get_id(vdev_mlme->vdev));
} else {
wma_send_del_bss_response(wma, resp);
return QDF_STATUS_SUCCESS;
}
if (vdev_stop_type == WMA_SET_LINK_STATE) {
lim_join_result_callback(wma->mac_context,
wlan_vdev_get_id(vdev_mlme->vdev));
} else {
mlme_set_vdev_start_failed(vdev_mlme->vdev, false);
wma_send_del_bss_response(wma, resp);
return QDF_STATUS_SUCCESS;
}
end: