From 56b7c642983428ce4ab8fc9a7598268afd2f7b4b Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 15 Nov 2021 18:20:05 +0100 Subject: [PATCH] Move T3172 T_defs_bts->T_defs_pcu to have it configurable in VTY The timers in T_defs_bts are actually set by BTS over PCUIF. That's not the case for T3172, hence let's move it to T_defs_pcu so it can be configured over VTY. Change-Id: If24191b2305007aa5be5b551c913738a97597c77 --- src/bts.cpp | 1 - src/gprs_pcu.c | 1 + src/tbf_ul_ass_fsm.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index 05a9cc04..5c870afb 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -79,7 +79,6 @@ void bts_trx_free_all_tbf(struct gprs_rlcmac_trx *trx) static struct osmo_tdef T_defs_bts[] = { { .T=3142, .default_val=20, .unit=OSMO_TDEF_S, .desc="Wait Indication used in Imm Ass Reject during TBF Establishment (CCCH)", .val=0, .min_val = 0, .max_val = 255 }, /* TS 44.018 10.5.2.43, TS 44.060 7.1.3.2.1 (T3172) */ { .T=3169, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of USF and TFI(s) after the MS uplink TBF assignment is invalid", .val=0 }, - { .T=3172, .default_val=5000,.unit=OSMO_TDEF_MS, .desc="Wait Indication used in Imm Ass Reject during TBF Establishment (PACCH)", .val=0, .min_val = 0, .max_val = 255000 }, /* TS 44.060 7.1.3.2.1 */ { .T=3191, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of TFI(s) after sending (1) last RLC Data Block on TBF(s), or (2) PACKET TBF RELEASE for an MBMS radio bearer", .val=0 }, { .T=3193, .default_val=100, .unit=OSMO_TDEF_MS, .desc="Reuse of TFI(s) after reception of final PACKET DOWNLINK ACK/NACK from MS for TBF", .val=0 }, { .T=3195, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of TFI(s) upon no response from the MS (radio failure or cell change) for TBF/MBMS radio bearer", .val=0 }, diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c index 76dd5be9..e8dba061 100644 --- a/src/gprs_pcu.c +++ b/src/gprs_pcu.c @@ -33,6 +33,7 @@ static struct osmo_tdef T_defs_pcu[] = { { .T=3113, .default_val=7, .unit=OSMO_TDEF_S, .desc="Timeout for paging", .val=0 }, { .T=3190, .default_val=5, .unit=OSMO_TDEF_S, .desc="Return to packet idle mode after Packet DL Assignment on CCCH (s)", .val=0}, { .T=3141, .default_val=10, .unit=OSMO_TDEF_S, .desc="Timeout for contention resolution procedure (s)", .val=0 }, + { .T=3172, .default_val=5000, .unit=OSMO_TDEF_MS, .desc="Wait Indication used in Imm Ass Reject during TBF Establishment (PACCH)", .val=0, .min_val = 0, .max_val = 255000 }, /* TS 44.060 7.1.3.2.1 */ { .T=PCU_TDEF_NEIGH_RESOLVE_TO, .default_val=1000, .unit=OSMO_TDEF_MS, .desc="[ARFCN+BSIC]->[RAC+CI] resolution timeout (ms)", .val=0 }, { .T=PCU_TDEF_SI_RESOLVE_TO, .default_val=1000, .unit=OSMO_TDEF_MS, .desc="RIM RAN-INFO response timeout (ms)", .val=0 }, { .T=PCU_TDEF_NEIGH_CACHE_ALIVE, .default_val=5, .unit=OSMO_TDEF_S, .desc="[ARFCN+BSIC]->[RAC+CI] resolution cache entry storage timeout (s)", .val=0 }, diff --git a/src/tbf_ul_ass_fsm.c b/src/tbf_ul_ass_fsm.c index ef75360a..90fe8280 100644 --- a/src/tbf_ul_ass_fsm.c +++ b/src/tbf_ul_ass_fsm.c @@ -64,7 +64,7 @@ static struct msgb *create_packet_access_reject(const struct tbf_ul_ass_fsm_ctx bitvec_unhex(packet_access_rej, DUMMY_VEC); write_packet_access_reject(packet_access_rej, ms_tlli(ms), - osmo_tdef_get(ms->bts->T_defs_bts, 3172, OSMO_TDEF_MS, -1)); + osmo_tdef_get(ms->bts->pcu->T_defs, 3172, OSMO_TDEF_MS, -1)); bts_do_rate_ctr_inc(ms->bts, CTR_PKT_ACCESS_REJ);