From bc3f1bfbb8562058e03acae60fa5ad95d162b845 Mon Sep 17 00:00:00 2001 From: Utkarsh Bhatnagar Date: Tue, 21 Apr 2020 15:59:18 +0530 Subject: [PATCH] qcacld-3.0: Changed the CFG_HE_TRIG_PAD default value to 16 us Made the default value to advertise trigger frame padding duration as 16 us so as to honor HE MAC capabilities sent by FW Change-Id: I1bf75965f1b9b46d61c94997273621a6e9de46c1 CRs-Fixed: 2667623 --- components/mlme/dispatcher/inc/cfg_mlme_he_caps.h | 4 ++-- components/mlme/dispatcher/src/wlan_mlme_api.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/mlme/dispatcher/inc/cfg_mlme_he_caps.h b/components/mlme/dispatcher/inc/cfg_mlme_he_caps.h index 7fd251e041e7..da5d397c6c46 100644 --- a/components/mlme/dispatcher/inc/cfg_mlme_he_caps.h +++ b/components/mlme/dispatcher/inc/cfg_mlme_he_caps.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2020 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 @@ -66,7 +66,7 @@ "he_trig_pad", \ 0, \ 2, \ - 0, \ + 2, \ CFG_VALUE_OR_DEFAULT, \ "HE Trig Pad") diff --git a/components/mlme/dispatcher/src/wlan_mlme_api.c b/components/mlme/dispatcher/src/wlan_mlme_api.c index 986c08fd3d7f..614b5d38e928 100644 --- a/components/mlme/dispatcher/src/wlan_mlme_api.c +++ b/components/mlme/dispatcher/src/wlan_mlme_api.c @@ -576,7 +576,8 @@ QDF_STATUS mlme_update_tgt_he_caps_in_cfg(struct wlan_objmgr_psoc *psoc, he_cap->min_frag_size; if (cfg_in_range(CFG_HE_TRIG_PAD, he_cap->trigger_frm_mac_pad)) mlme_obj->cfg.he_caps.dot11_he_cap.trigger_frm_mac_pad = - he_cap->trigger_frm_mac_pad; + QDF_MIN(he_cap->trigger_frm_mac_pad, + mlme_obj->cfg.he_caps.dot11_he_cap.trigger_frm_mac_pad); if (cfg_in_range(CFG_HE_MTID_AGGR_RX, he_cap->multi_tid_aggr_rx_supp)) mlme_obj->cfg.he_caps.dot11_he_cap.multi_tid_aggr_rx_supp = he_cap->multi_tid_aggr_rx_supp;