From 1e974a9312730c29d377c130feaa6f92be174a77 Mon Sep 17 00:00:00 2001 From: Tiger Yu Date: Mon, 9 Dec 2019 10:38:08 +0800 Subject: [PATCH] qcacmn: Reset ba_status to inactive irrespective of tid update status Reset ba_status to inactive irrespective of tid update status to make sure the ba_status reset successfully. And also use pe_err_rl instead of pe_err to avoid excessive logging. Change-Id: Ifc6adc166b5093742b34dd7d74924f9d54146ea4 CRs-Fixed: 2577663 --- dp/wifi3.0/dp_main.c | 3 +-- dp/wifi3.0/dp_peer.c | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index 931965d8ec..e00fc890d4 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -9774,8 +9774,7 @@ dp_peer_get_ref_find_by_addr(struct cdp_pdev *dev, uint8_t *peer_mac_addr, if (!peer) return NULL; - DP_TRACE(INFO, "%s: peer %pK mac: %pM", __func__, peer, - peer->mac_addr.raw); + dp_info_rl("peer %pK mac: %pM", peer, peer->mac_addr.raw); return peer; } diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c index ad4b75aaf5..fb7a51c6a4 100644 --- a/dp/wifi3.0/dp_peer.c +++ b/dp/wifi3.0/dp_peer.c @@ -2537,7 +2537,6 @@ int dp_addba_resp_tx_completion_wifi3(void *peer_handle, { struct dp_peer *peer = (struct dp_peer *)peer_handle; struct dp_rx_tid *rx_tid = NULL; - QDF_STATUS qdf_status; if (!peer || peer->delete_in_progress) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, @@ -2548,10 +2547,9 @@ int dp_addba_resp_tx_completion_wifi3(void *peer_handle, qdf_spin_lock_bh(&rx_tid->tid_lock); if (status) { rx_tid->num_addba_rsp_failed++; - qdf_status = dp_rx_tid_update_wifi3(peer, tid, 1, - IEEE80211_SEQ_MAX); - if (qdf_status == QDF_STATUS_SUCCESS) - rx_tid->ba_status = DP_RX_BA_INACTIVE; + dp_rx_tid_update_wifi3(peer, tid, 1, + IEEE80211_SEQ_MAX); + rx_tid->ba_status = DP_RX_BA_INACTIVE; qdf_spin_unlock_bh(&rx_tid->tid_lock); dp_err("RxTid- %d addba rsp tx completion failed", tid); return QDF_STATUS_SUCCESS;