aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2014-01-14 12:10:44 +0100
committerHarald Welte <laforge@gnumonks.org>2015-09-06 14:48:31 +0200
commit4663bc1c98145e35bf51f156ccb53cad90afcaa9 (patch)
tree7f9600c692693576f6e2f1472a33bc52b2f8cac8
parent97e6de22bf1ebcba876403f1e99bae580aa09333 (diff)
trx: Set lchan inactive, only if the dedicated channel is deactivated
-rw-r--r--src/osmo-bts-trx/l1_if.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index 56cba4f0..3f2a565a 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -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,