summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-05-31 14:44:48 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-06-17 21:49:47 +0200
commitf37ef71d98a4bd54d6df826dcfc69c8f5fa708d3 (patch)
tree092bfede314479e75fe71187dcf0682493c5d793
parentbae291bdafdfe180f92abd042374c07974df5fac (diff)
disable T3111 error timer -- TODO really?neels/dyn_pdch_extra
-rw-r--r--openbsc/src/libbsc/abis_rsl.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index e7719f9df..eb65b3e94 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -68,18 +68,13 @@ static void send_lchan_signal(int sig_no, struct gsm_lchan *lchan,
static void do_lchan_free(struct gsm_lchan *lchan)
{
- /* We start the error timer to make the channel available again */
- if (lchan->state == LCHAN_S_REL_ERR) {
- lchan->error_timer.data = lchan;
- lchan->error_timer.cb = error_timeout_cb;
- osmo_timer_schedule(&lchan->error_timer,
- lchan->ts->trx->bts->network->T3111 + 2, 0);
- } else {
+ lchan_free(lchan);
+ if (lchan->state != LCHAN_S_REL_ERR) {
+ /* we don't have an error timer pending to release that */
rsl_lchan_set_state(lchan, LCHAN_S_NONE);
/* defragment TCH/F+PDCH shared channels */
do_pdch_defrag(lchan->ts->trx->bts);
}
- lchan_free(lchan);
}
static uint8_t mdisc_by_msgtype(uint8_t msg_type)