diff options
| author | Eric Wild <ewild@sysmocom.de> | 2019-06-21 18:38:21 +0200 |
|---|---|---|
| committer | Hoernchen <ewild@sysmocom.de> | 2019-06-21 17:00:04 +0000 |
| commit | 5b9212d6c5562b805888c44f4dcf6829f01e178f (patch) | |
| tree | c37f180746bf1389dd6f4d61901fa1fd14b78d08 /src | |
| parent | 876edd5e350ef3264fa82f1466443d16ccb38d63 (diff) | |
revert changes to T200
The timers are unfortunately completely broken, so let's go back to the
long default timeout values from 1ff0a2addd04de5bfe1601e84b013c65e500faf0
See related issues OS#4066 and OS#4074
Change-Id: Ia44310245a348675dbbf3ffc3dc5b6d207fd62d3
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/oml.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/common/oml.c b/src/common/oml.c index 8ecafbb3..3defa494 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -479,13 +479,13 @@ int oml_mo_tx_sw_act_rep(const struct gsm_abis_mo *mo) /* The defaults below correspond to various sources/recommendations that could be found online. * The BSC should override this via OML anyway. */ const unsigned int oml_default_t200_ms[7] = { - [T200_SDCCH] = 220, - [T200_SDCCH_SAPI3] = 450, - [T200_SACCH_SDCCH] = 900, - [T200_FACCH_F] = 250, - [T200_FACCH_H] = 250, - [T200_SACCH_TCH_SAPI0] = 1500, - [T200_SACCH_TCH_SAPI3] = 1500, + [T200_SDCCH] = 1000, + [T200_FACCH_F] = 1000, + [T200_FACCH_H] = 1000, + [T200_SACCH_TCH_SAPI0] = 2000, + [T200_SACCH_SDCCH] = 2000, + [T200_SDCCH_SAPI3] = 1000, + [T200_SACCH_TCH_SAPI3] = 2000, }; /* 3GPP TS 52.021 ยง8.11.1 Get Attributes has been received */ @@ -626,10 +626,20 @@ static int oml_rx_set_bts_attr(struct gsm_bts *bts, struct msgb *msg) payload = TLVP_VAL(&tp, NM_ATT_T200); for (i = 0; i < ARRAY_SIZE(bts->t200_ms); i++) { uint32_t t200_ms = payload[i] * abis_nm_t200_ms[i]; +#if 0 bts->t200_ms[i] = t200_ms; DEBUGPFOH(DOML, foh, "T200[%u]: OML=%u, mult=%u => %u ms\n", i, payload[i], abis_nm_t200_ms[i], bts->t200_ms[i]); +#else + /* we'd rather use the 1s/2s (long) defaults by + * libosmocore, as we appear to have some bug(s) + * related to handling T200 expiration in + * libosmogsm lapd(m) code? */ + LOGPFOH(DOML, LOGL_NOTICE, foh, "Ignoring T200[%u] (%u ms) " + "as sent by BSC due to suspected LAPDm bug!\n", + i, t200_ms); +#endif } } |