From ec2d8ab7ff57fd2472d27075db94619923490a1b Mon Sep 17 00:00:00 2001 From: Subrat Dash Date: Mon, 7 Sep 2020 12:45:57 +0530 Subject: [PATCH] qcacld-3.0: Enable UAPSD when TWT requster mode is disabled The csr_enable_twt() returns true when the fw is 802.11ax capable. This lead to failure of UAPSD even though the twt requested mode is disabled throgh ini. Fix the logic in the csr_enable_twt() to enable UAPSD when the twt requester mode is disabled. Change-Id: I5338b95b66312337d6b8befe700f31f3e214b7b1 CRs-Fixed: 2765999 --- core/sme/src/csr/csr_api_roam.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 0896b7fe4305..9ad11fd0b73c 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -14697,8 +14697,7 @@ csr_check_vendor_ap_3_present(struct mac_context *mac_ctx, uint8_t *ie, static bool csr_enable_twt(struct mac_context *mac_ctx, tDot11fBeaconIEs *ie) { - if ((IS_FEATURE_SUPPORTED_BY_FW(DOT11AX) || - mac_ctx->mlme_cfg->twt_cfg.is_twt_requestor_enabled) && ie && + if (mac_ctx->mlme_cfg->twt_cfg.is_twt_requestor_enabled && ie && (ie->qcn_ie.present || ie->he_cap.twt_responder)) { sme_debug("TWT is supported, hence disable UAPSD; twt req supp: %d,twt respon supp: %d, QCN_IE: %d", mac_ctx->mlme_cfg->twt_cfg.is_twt_requestor_enabled,