summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Johnson <jjohnson@qca.qualcomm.com>2014-10-08 13:47:00 -0700
committerAnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com>2014-10-13 20:32:20 +0530
commitb67e1f3da5464978d6428b6686b941bc930e3e5d (patch)
tree347521a76f7974774c7d66ef075aec024c0e7144
parenta1127f3568be3a7c3567a76738a57006f0b65e22 (diff)
qcacld: Remove obsolete TL WFQ configuration support
qcacld inherited from prima support for the following cfg.ini items: WfqBeWeight, WfqBkWeight, WfqViWeight, WfqVoWeight TL, and the WFQ algorithm, are not used by qcacld so remove support for configuring the WFQ parameters. Change-Id: Iceab917653146874efd8e5e78abf63c753f25a20 CRs-fixed: 736012
-rw-r--r--CORE/CLD_TXRX/TXRX/txrx.h1
-rw-r--r--CORE/HDD/inc/wlan_hdd_cfg.h24
-rw-r--r--CORE/HDD/src/wlan_hdd_cfg.c32
-rw-r--r--CORE/TL/inc/wlan_qct_tl.h3
-rw-r--r--CORE/VOSS/src/vos_api.c4
5 files changed, 0 insertions, 64 deletions
diff --git a/CORE/CLD_TXRX/TXRX/txrx.h b/CORE/CLD_TXRX/TXRX/txrx.h
index 89645112ee8a..c5b705031cdf 100644
--- a/CORE/CLD_TXRX/TXRX/txrx.h
+++ b/CORE/CLD_TXRX/TXRX/txrx.h
@@ -138,7 +138,6 @@ struct wlan_txrx_ind_req {
};
struct wlan_txrx_config_param {
- u8 ucAcWeights[TXRX_NUM_WMM_AC];
u32 uDelayedTriggerFrmInt;
u8 uMinFramesProcThres;
};
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index c1d3eaf27676..ec0ce662dd46 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -938,26 +938,6 @@ typedef enum
#define CFG_QOS_WMM_INFRA_SBA_AC_BK_DEFAULT (0x2001)
// TL configuration
-#define CFG_TL_WFQ_BK_WEIGHT_NAME "WfqBkWeight"
-#define CFG_TL_WFQ_BK_WEIGHT_MIN 1
-#define CFG_TL_WFQ_BK_WEIGHT_MAX 0xFF
-#define CFG_TL_WFQ_BK_WEIGHT_DEFAULT 1
-
-#define CFG_TL_WFQ_BE_WEIGHT_NAME "WfqBeWeight"
-#define CFG_TL_WFQ_BE_WEIGHT_MIN 1
-#define CFG_TL_WFQ_BE_WEIGHT_MAX 0xFF
-#define CFG_TL_WFQ_BE_WEIGHT_DEFAULT 3
-
-#define CFG_TL_WFQ_VI_WEIGHT_NAME "WfqViWeight"
-#define CFG_TL_WFQ_VI_WEIGHT_MIN 1
-#define CFG_TL_WFQ_VI_WEIGHT_MAX 0xFF
-#define CFG_TL_WFQ_VI_WEIGHT_DEFAULT 5
-
-#define CFG_TL_WFQ_VO_WEIGHT_NAME "WfqVoWeight"
-#define CFG_TL_WFQ_VO_WEIGHT_MIN 1
-#define CFG_TL_WFQ_VO_WEIGHT_MAX 0xFF
-#define CFG_TL_WFQ_VO_WEIGHT_DEFAULT 7
-
#define CFG_TL_DELAYED_TRGR_FRM_INT_NAME "DelayedTriggerFrmInt"
#define CFG_TL_DELAYED_TRGR_FRM_INT_MIN 1
#define CFG_TL_DELAYED_TRGR_FRM_INT_MAX (4294967295UL)
@@ -3035,10 +3015,6 @@ typedef struct
v_U16_t InfraSbaAcBk;
/* TL related configuration */
- v_U8_t WfqBkWeight;
- v_U8_t WfqBeWeight;
- v_U8_t WfqViWeight;
- v_U8_t WfqVoWeight;
v_U32_t DelayedTriggerFrmInt;
v_U16_t BkReorderAgingTime;
v_U16_t BeReorderAgingTime;
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index b69b0e59fab2..f33e53a73a83 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -1344,34 +1344,6 @@ REG_TABLE_ENTRY g_registry_table[] =
CFG_QOS_WMM_INFRA_SBA_AC_BK_MIN,
CFG_QOS_WMM_INFRA_SBA_AC_BK_MAX ),
- REG_VARIABLE( CFG_TL_WFQ_BK_WEIGHT_NAME , WLAN_PARAM_Integer,
- hdd_config_t, WfqBkWeight,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_TL_WFQ_BK_WEIGHT_DEFAULT,
- CFG_TL_WFQ_BK_WEIGHT_MIN,
- CFG_TL_WFQ_BK_WEIGHT_MAX ),
-
- REG_VARIABLE( CFG_TL_WFQ_BE_WEIGHT_NAME , WLAN_PARAM_Integer,
- hdd_config_t, WfqBeWeight,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_TL_WFQ_BE_WEIGHT_DEFAULT,
- CFG_TL_WFQ_BE_WEIGHT_MIN,
- CFG_TL_WFQ_BE_WEIGHT_MAX ),
-
- REG_VARIABLE( CFG_TL_WFQ_VI_WEIGHT_NAME , WLAN_PARAM_Integer,
- hdd_config_t, WfqViWeight,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_TL_WFQ_VI_WEIGHT_DEFAULT,
- CFG_TL_WFQ_VI_WEIGHT_MIN,
- CFG_TL_WFQ_VI_WEIGHT_MAX ),
-
- REG_VARIABLE( CFG_TL_WFQ_VO_WEIGHT_NAME , WLAN_PARAM_Integer,
- hdd_config_t, WfqVoWeight,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_TL_WFQ_VO_WEIGHT_DEFAULT,
- CFG_TL_WFQ_VO_WEIGHT_MIN,
- CFG_TL_WFQ_VO_WEIGHT_MAX ),
-
REG_VARIABLE( CFG_TL_DELAYED_TRGR_FRM_INT_NAME , WLAN_PARAM_Integer,
hdd_config_t, DelayedTriggerFrmInt,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -4248,10 +4220,6 @@ void print_hdd_cfg(hdd_context_t *pHddCtx)
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcBk] Value = [0x%x] ",pHddCtx->cfg_ini->InfraMinPhyRateAcBk);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcBk] Value = [0x%x] ",pHddCtx->cfg_ini->InfraSbaAcBk);
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [WfqBkWeight] Value = [%u] ",pHddCtx->cfg_ini->WfqBkWeight);
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [WfqBeWeight] Value = [%u] ",pHddCtx->cfg_ini->WfqBeWeight);
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [WfqViWeight] Value = [%u] ",pHddCtx->cfg_ini->WfqViWeight);
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [WfqVoWeight] Value = [%u] ",pHddCtx->cfg_ini->WfqVoWeight);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [DelayedTriggerFrmInt] Value = [%u] ",pHddCtx->cfg_ini->DelayedTriggerFrmInt);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [BkReorderAgingTime] Value = [%u] ",pHddCtx->cfg_ini->BkReorderAgingTime);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [BeReorderAgingTime] Value = [%u] ",pHddCtx->cfg_ini->BeReorderAgingTime);
diff --git a/CORE/TL/inc/wlan_qct_tl.h b/CORE/TL/inc/wlan_qct_tl.h
index 2baf0ef4ea22..e39856a1acdc 100644
--- a/CORE/TL/inc/wlan_qct_tl.h
+++ b/CORE/TL/inc/wlan_qct_tl.h
@@ -261,9 +261,6 @@ typedef struct
---------------------------------------------------------------------------*/
typedef struct
{
- /*AC weight for WFQ*/
- v_U8_t ucAcWeights[WLANTL_MAX_AC];
-
/*Delayed trigger frame timmer: - used by TL to send trigger frames less
often when it has established that the App is suspended*/
v_U32_t uDelayedTriggerFrmInt;
diff --git a/CORE/VOSS/src/vos_api.c b/CORE/VOSS/src/vos_api.c
index 66dc8f4b41e2..06fdb7d4613a 100644
--- a/CORE/VOSS/src/vos_api.c
+++ b/CORE/VOSS/src/vos_api.c
@@ -1996,10 +1996,6 @@ vos_fetch_tl_cfg_parms
return;
}
- pTLConfig->ucAcWeights[0] = pConfig->WfqBkWeight;
- pTLConfig->ucAcWeights[1] = pConfig->WfqBeWeight;
- pTLConfig->ucAcWeights[2] = pConfig->WfqViWeight;
- pTLConfig->ucAcWeights[3] = pConfig->WfqVoWeight;
pTLConfig->ucReorderAgingTime[0] = pConfig->BkReorderAgingTime;/*WLANTL_AC_BK*/
pTLConfig->ucReorderAgingTime[1] = pConfig->BeReorderAgingTime;/*WLANTL_AC_BE*/
pTLConfig->ucReorderAgingTime[2] = pConfig->ViReorderAgingTime;/*WLANTL_AC_VI*/