From 1e88d691ededaa2025a3cdc4a310bd116aa0ae4a Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Fri, 8 Oct 2021 00:51:25 +0600 Subject: [PATCH] rsl_lchan_lookup(): fix handling of ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH If an RF Resource Indication message includes interference band(s) for 'pure' PDCH (i.e. not dynamic) timeslot(s), osmo-bsc logs: DRSL DEBUG abis_rsl.c:1515 (bts=0,trx=0) Rx Resource Indication DRSL ERROR bts_trx.c:236 (bts=0,trx=0) chan_nr 0xc7 cbits 0x18: (bts=0,trx=0,ts=7,pchan=PDCH,state=UNUSED) is not GSM_PCHAN_OSMO_DYN DRSL ERROR abis_rsl.c:141 (bts=0,trx=0,ts=7,pchan=PDCH,state=UNUSED) Abis RSL Rx Resource Indication: mismatching chan_nr=0xc7 Let's better check if a timeslot is capable of GSM_PCHAN_PDCH, rather than checking if it's GSM_PCHAN_OSMO_DYN. Change-Id: I2cac4acd4c5145c5c525c9952fdc754477ce0942 Related: SYS#5313 --- src/osmo-bsc/bts_trx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c index 9b90c91d7..f30c748d6 100644 --- a/src/osmo-bsc/bts_trx.c +++ b/src/osmo-bsc/bts_trx.c @@ -232,9 +232,9 @@ struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, break; case ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH: lch_idx = 0; - ok = (ts->pchan_on_init == GSM_PCHAN_OSMO_DYN); + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_PDCH); if (!ok) - LOG_TRX(trx, DRSL, LOGL_ERROR, "chan_nr 0x%x cbits 0x%x: %s is not GSM_PCHAN_OSMO_DYN\n", + LOG_TRX(trx, DRSL, LOGL_ERROR, "chan_nr 0x%x cbits 0x%x: %s is not capable of GSM_PCHAN_PDCH\n", chan_nr, cbits, gsm_ts_and_pchan_name(ts)); break; default: