From 2560111dd25cf6e0b3443fa0b81e0bc13627eb83 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Mon, 28 Nov 2016 20:51:44 -0800 Subject: [PATCH] qcacld-3.0: Logical AND current UAPSD bitmask with ADDTS rsp values In function sme_ps_fill_uapsd_req_params perform a logical AND rather than OR between current UASPD bitmask and values received in ADDTS response, otherwise existing UAPSD bitmask (if all set) will always override ADDTS rsp values. Change-Id: I17872f62b1f073963d3c04ad72415acd395f1ca5 CRs-Fixed: 1095306 --- core/sme/src/common/sme_power_save.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index 5045140ecdf7..88f124e24598 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -81,11 +81,11 @@ static void sme_ps_fill_uapsd_req_params(tpAniSirGlobal mac_ctx, struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; uapsd_delivery_mask = - ps_param->uapsd_per_ac_bit_mask | + ps_param->uapsd_per_ac_bit_mask & ps_param->uapsd_per_ac_delivery_enable_mask; uapsd_trigger_mask = - ps_param->uapsd_per_ac_bit_mask | + ps_param->uapsd_per_ac_bit_mask & ps_param->uapsd_per_ac_trigger_enable_mask; uapsdParams->bkDeliveryEnabled =