diff options
| author | Max <msuraev@sysmocom.de> | 2016-12-12 12:36:28 +0100 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2016-12-12 12:36:28 +0100 |
| commit | 2c95ae6a091083a7d1108aa852d6bfacd442f62d (patch) | |
| tree | face7c119f01a7091f81279fdce661c956cb0d78 | |
| parent | a1fa955212e18ddca286a2c7d30333116406f56b (diff) | |
osmo-bts-trx: fix lchan deactivation
Use chan_nr for deactivating lchan instead of lchan->nr: chan_nr is the
RSL Channel Number IE value, a bitfield aggregation of lchan type
bits (cbits) and lchan number (lowest three bits). The error was
introduced in 36153239bfd0b633c4d259a9de0a759f41197a2b.
Change-Id: I6dd7060422ab9d18743c1ff2ab419e3e7299d74d
| -rw-r--r-- | src/osmo-bts-trx/l1_if.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 6304c1f5..a42d39a0 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -155,14 +155,16 @@ int bts_model_lchan_deactivate(struct gsm_lchan *lchan) /* set lchan inactive */ lchan_set_state(lchan, LCHAN_S_NONE); - return trx_sched_set_lchan(&l1h->l1s, lchan->nr, LID_DEDIC, 0); + return trx_sched_set_lchan(&l1h->l1s, gsm_lchan2chan_nr(lchan), + LID_DEDIC, 0); } int bts_model_lchan_deactivate_sacch(struct gsm_lchan *lchan) { struct phy_instance *pinst = trx_phy_instance(lchan->ts->trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - return trx_sched_set_lchan(&l1h->l1s, lchan->nr, LID_SACCH, 0); + return trx_sched_set_lchan(&l1h->l1s, gsm_lchan2chan_nr(lchan), + LID_SACCH, 0); } /* |