From dc8b1207a166156ecaf447538727daa4702fab49 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Thu, 13 Jun 2013 10:19:46 +0200 Subject: handover: Use common function to reset handover state Conflicts: src/common/rsl.c --- src/common/handover.c | 7 ++++++- src/common/rsl.c | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/common/handover.c b/src/common/handover.c index 6dedf9ea..cd86428d 100644 --- a/src/common/handover.c +++ b/src/common/handover.c @@ -136,10 +136,15 @@ void handover_frame(struct gsm_lchan *lchan) LOGP(DHO, LOGL_INFO, "%s First valid frame detected\n", gsm_lchan_name(lchan)); + reset_handover(lchan); +} + +/* release handover starte */ +void reset_handover(struct gsm_lchan *lchan) +{ /* Stop T3105 */ osmo_timer_del(&lchan->ho.t3105); /* Handover process is done */ lchan->ho.active = HANDOVER_NONE; } - diff --git a/src/common/rsl.c b/src/common/rsl.c index f039f432..09b815b2 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -833,9 +833,8 @@ static int rsl_rx_rf_chan_rel(struct gsm_lchan *lchan) msgb_queue_flush(&lchan->dl_tch_queue); } - /* deactivate handover RACH detection and timer */ - lchan->ho.active = HANDOVER_NONE; - osmo_timer_del(&lchan->ho.t3105); + /* release handover state */ + reset_handover(lchan); lchan->rel_act_kind = LCHAN_REL_ACT_RSL; rc = bts_model_rsl_chan_rel(lchan); -- cgit v1.2.3