From 731d63660dcb0819e23a38c7ee4c7def0f9713a6 Mon Sep 17 00:00:00 2001 From: Tushnim Bhattacharyya Date: Mon, 30 Sep 2019 17:17:04 -0700 Subject: [PATCH] qcacld-3.0: Replace timer_stop with timer_stop_sync in p2p module Replace timer_stop with timer_stop_sync & add some debug print to track the roc cookie. Change-Id: I9a71d30b31da3de2bf3242e4a310bad4542b10aa CRs-Fixed: 2537164 --- components/p2p/core/src/wlan_p2p_roc.c | 2 +- components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/components/p2p/core/src/wlan_p2p_roc.c b/components/p2p/core/src/wlan_p2p_roc.c index 1a090e11f7..2250440b74 100644 --- a/components/p2p/core/src/wlan_p2p_roc.c +++ b/components/p2p/core/src/wlan_p2p_roc.c @@ -687,7 +687,7 @@ QDF_STATUS p2p_restart_roc_timer(struct p2p_roc_context *roc_ctx) if (QDF_TIMER_STATE_RUNNING == qdf_mc_timer_get_current_state(&roc_ctx->roc_timer)) { p2p_debug("roc timer is running"); - status = qdf_mc_timer_stop(&roc_ctx->roc_timer); + status = qdf_mc_timer_stop_sync(&roc_ctx->roc_timer); if (status != QDF_STATUS_SUCCESS) { p2p_err("Failed to stop roc timer"); return status; diff --git a/components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c b/components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c index f2a6c38aa6..0083c002e8 100644 --- a/components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c +++ b/components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2019 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 @@ -199,7 +199,7 @@ QDF_STATUS ucfg_p2p_roc_cancel_req(struct wlan_objmgr_psoc *soc, status = qdf_idr_find(&p2p_soc_obj->p2p_idr, cookie, &roc_ctx); if (QDF_IS_STATUS_ERROR(status)) { - p2p_err("invalid id"); + p2p_err("invalid id for cookie 0x%llx", cookie); return QDF_STATUS_E_INVAL; } @@ -400,6 +400,8 @@ QDF_STATUS ucfg_p2p_mgmt_tx(struct wlan_objmgr_psoc *soc, p2p_err("post msg fail:%d", status); } + p2p_debug("cookie = 0x%llx", *cookie); + return status; } @@ -429,7 +431,7 @@ QDF_STATUS ucfg_p2p_mgmt_tx_cancel(struct wlan_objmgr_psoc *soc, status = qdf_idr_find(&p2p_soc_obj->p2p_idr, (int32_t)cookie, &tx_ctx); if (QDF_IS_STATUS_ERROR(status)) { - p2p_debug("invalid id"); + p2p_debug("invalid id for cookie 0x%llx", cookie); return QDF_STATUS_E_INVAL; } p2p_del_random_mac(soc, wlan_vdev_get_id(vdev), cookie, 20);