summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Johnson <jjohnson@qca.qualcomm.com>2014-10-08 14:14:39 -0700
committerAnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com>2014-10-13 20:32:20 +0530
commit83702995fb0af53a4717613e855f37e40949e6b7 (patch)
tree682081f46f189d7c1504c1b40b40eadbe7ef87e3
parentb67e1f3da5464978d6428b6686b941bc930e3e5d (diff)
qcacld: Remove obsolete TL Reorder Timer configuration support
qcacld inherited from prima support for the following cfg.ini items: BkReorderTime, BeReorderTime, ViReorderTime, & VoReorderTime TL, and the reorder timers, are not used by qcacld so remove support for configuring the reorder timers. Change-Id: I0125a40e6b5e60bb9ec7a1e9210cd28ba929cb7b CRs-fixed: 736023
-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.h2
-rw-r--r--CORE/VOSS/src/vos_api.c4
4 files changed, 0 insertions, 62 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index ec0ce662dd46..15413b8845f7 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -943,26 +943,6 @@ typedef enum
#define CFG_TL_DELAYED_TRGR_FRM_INT_MAX (4294967295UL)
#define CFG_TL_DELAYED_TRGR_FRM_INT_DEFAULT 3000
-#define CFG_REORDER_TIME_BK_NAME "BkReorderTime"
-#define CFG_REORDER_TIME_BK_MIN 30
-#define CFG_REORDER_TIME_BK_MAX 1000
-#define CFG_REORDER_TIME_BK_DEFAULT 100
-
-#define CFG_REORDER_TIME_BE_NAME "BeReorderTime"
-#define CFG_REORDER_TIME_BE_MIN 30
-#define CFG_REORDER_TIME_BE_MAX 1000
-#define CFG_REORDER_TIME_BE_DEFAULT 100
-
-#define CFG_REORDER_TIME_VI_NAME "ViReorderTime"
-#define CFG_REORDER_TIME_VI_MIN 30
-#define CFG_REORDER_TIME_VI_MAX 1000
-#define CFG_REORDER_TIME_VI_DEFAULT 100
-
-#define CFG_REORDER_TIME_VO_NAME "VoReorderTime"
-#define CFG_REORDER_TIME_VO_MIN 30
-#define CFG_REORDER_TIME_VO_MAX 1000
-#define CFG_REORDER_TIME_VO_DEFAULT 40
-
#if defined WLAN_FEATURE_VOWIFI
#define CFG_RRM_ENABLE_NAME "gRrmEnable"
#define CFG_RRM_ENABLE_MIN (0)
@@ -3016,10 +2996,6 @@ typedef struct
/* TL related configuration */
v_U32_t DelayedTriggerFrmInt;
- v_U16_t BkReorderAgingTime;
- v_U16_t BeReorderAgingTime;
- v_U16_t ViReorderAgingTime;
- v_U16_t VoReorderAgingTime;
/* Wowl pattern */
char wowlPattern[1024];
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index f33e53a73a83..ae9e751e7524 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -1351,34 +1351,6 @@ REG_TABLE_ENTRY g_registry_table[] =
CFG_TL_DELAYED_TRGR_FRM_INT_MIN,
CFG_TL_DELAYED_TRGR_FRM_INT_MAX ),
- REG_VARIABLE( CFG_REORDER_TIME_BK_NAME , WLAN_PARAM_Integer,
- hdd_config_t, BkReorderAgingTime,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_REORDER_TIME_BK_DEFAULT,
- CFG_REORDER_TIME_BK_MIN,
- CFG_REORDER_TIME_BK_MAX ),
-
- REG_VARIABLE( CFG_REORDER_TIME_BE_NAME , WLAN_PARAM_Integer,
- hdd_config_t, BeReorderAgingTime,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_REORDER_TIME_BE_DEFAULT,
- CFG_REORDER_TIME_BE_MIN,
- CFG_REORDER_TIME_BE_MAX ),
-
- REG_VARIABLE( CFG_REORDER_TIME_VI_NAME , WLAN_PARAM_Integer,
- hdd_config_t, ViReorderAgingTime,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_REORDER_TIME_VI_DEFAULT,
- CFG_REORDER_TIME_VI_MIN,
- CFG_REORDER_TIME_VI_MAX ),
-
- REG_VARIABLE( CFG_REORDER_TIME_VO_NAME , WLAN_PARAM_Integer,
- hdd_config_t, VoReorderAgingTime,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_REORDER_TIME_VO_DEFAULT,
- CFG_REORDER_TIME_VO_MIN,
- CFG_REORDER_TIME_VO_MAX ),
-
REG_VARIABLE_STRING( CFG_WOWL_PATTERN_NAME, WLAN_PARAM_String,
hdd_config_t, wowlPattern,
VAR_FLAGS_OPTIONAL,
@@ -4221,10 +4193,6 @@ void print_hdd_cfg(hdd_context_t *pHddCtx)
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 = [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);
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [ViReorderAgingTime] Value = [%u] ",pHddCtx->cfg_ini->ViReorderAgingTime);
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [VoReorderAgingTime] Value = [%u] ",pHddCtx->cfg_ini->VoReorderAgingTime);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [mcastBcastFilterSetting] Value = [%u] ",pHddCtx->cfg_ini->mcastBcastFilterSetting);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [fhostArpOffload] Value = [%u] ",pHddCtx->cfg_ini->fhostArpOffload);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [ssdp] Value = [%u] ", pHddCtx->cfg_ini->ssdp);
diff --git a/CORE/TL/inc/wlan_qct_tl.h b/CORE/TL/inc/wlan_qct_tl.h
index e39856a1acdc..2a41929a79db 100644
--- a/CORE/TL/inc/wlan_qct_tl.h
+++ b/CORE/TL/inc/wlan_qct_tl.h
@@ -274,8 +274,6 @@ typedef struct
/* Rx processing in thread from TL shim */
v_BOOL_t enable_rxthread;
- /* Re-order Aging Time */
- v_U16_t ucReorderAgingTime[WLANTL_MAX_AC];
}WLANTL_ConfigInfoType;
/*---------------------------------------------------------------------------
diff --git a/CORE/VOSS/src/vos_api.c b/CORE/VOSS/src/vos_api.c
index 06fdb7d4613a..daf15abedb82 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->ucReorderAgingTime[0] = pConfig->BkReorderAgingTime;/*WLANTL_AC_BK*/
- pTLConfig->ucReorderAgingTime[1] = pConfig->BeReorderAgingTime;/*WLANTL_AC_BE*/
- pTLConfig->ucReorderAgingTime[2] = pConfig->ViReorderAgingTime;/*WLANTL_AC_VI*/
- pTLConfig->ucReorderAgingTime[3] = pConfig->VoReorderAgingTime;/*WLANTL_AC_VO*/
pTLConfig->uDelayedTriggerFrmInt = pConfig->DelayedTriggerFrmInt;
pTLConfig->uMinFramesProcThres = pConfig->MinFramesProcThres;
pTLConfig->ip_checksum_offload = pConfig->enableIPChecksumOffload;