trx: Set lchan inactive, only if the dedicated channel is deactivated

This commit is contained in:
Andreas Eversberg 2014-01-14 12:10:44 +01:00 committed by Harald Welte
parent f39c739bd6
commit a7d0c5ef5a
1 changed files with 3 additions and 4 deletions

View File

@ -569,11 +569,10 @@ int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap)
}
/* deactivate associated channel */
trx_sched_set_lchan(l1h, chan_nr, 0x40, 0);
/* set lchan inactive
* (also if only sacch, so no meaurement is done) */
lchan_set_state(lchan, LCHAN_S_NONE);
/* deactivate dedicated channel */
if (!l1sap->u.info.u.act_req.sacch_only) {
/* set lchan inactive */
lchan_set_state(lchan, LCHAN_S_NONE);
/* deactivate dedicated channel */
trx_sched_set_lchan(l1h, chan_nr, 0x00, 0);
/* confirm only on dedicated channel */
mph_info_chan_confirm(l1h, chan_nr,