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 36153239bf.

Change-Id: I6dd7060422ab9d18743c1ff2ab419e3e7299d74d
This commit is contained in:
Max 2016-12-12 12:36:28 +01:00
parent a1fa955212
commit 2c95ae6a09
1 changed files with 4 additions and 2 deletions

View File

@ -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);
}
/*