From 44b1743568765253d9968fcf3b1c3eb8c804eddb Mon Sep 17 00:00:00 2001 From: hangtian Date: Wed, 9 Jan 2019 17:50:11 +0800 Subject: [PATCH] qcacld-3.0: Use status value 0 stands for tdls_mgmt success Use status value 0 stands for tdls_mgmt success. Change-Id: I64834f7beaf2a58fd544d4ff5501aac6e7e5b5c7 CRs-Fixed: 2377881 --- core/wma/src/wma_data.c | 2 +- os_if/tdls/src/wlan_cfg80211_tdls.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 272bc8296b21..73294e4874bd 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -864,7 +864,7 @@ static void wma_data_tx_ack_work_handler(void *ack_work) /* Call the Ack Cb registered by UMAC */ if (ack_cb) ack_cb((struct mac_context *) (wma_handle->mac_context), NULL, - work->status ? 0 : 1, NULL); + work->status, NULL); else WMA_LOGE("Data Tx Ack Cb is NULL"); diff --git a/os_if/tdls/src/wlan_cfg80211_tdls.c b/os_if/tdls/src/wlan_cfg80211_tdls.c index 6a04713f4de5..b23770285410 100644 --- a/os_if/tdls/src/wlan_cfg80211_tdls.c +++ b/os_if/tdls/src/wlan_cfg80211_tdls.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 @@ -758,7 +758,8 @@ int wlan_cfg80211_tdls_mgmt(struct wlan_objmgr_vdev *vdev, &tdls_priv->tdls_mgmt_comp, msecs_to_jiffies(WAIT_TIME_FOR_TDLS_MGMT)); - if ((0 == rc) || (true != tdls_priv->mgmt_tx_completion_status)) { + if ((0 == rc) || (QDF_STATUS_SUCCESS != + tdls_priv->mgmt_tx_completion_status)) { cfg80211_err("%s rc %ld mgmtTxCompletionStatus %u", !rc ? "Mgmt Tx Completion timed out" : "Mgmt Tx Completion failed",