From 2b416d6d2b7b86fc04a8478f7a1a205d05349d24 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Wed, 9 Dec 2020 14:01:27 +0100 Subject: nm_channel_fsm: Fix several FSM internal transitions not being made During the initial implementation I used the wrong function to change state. As a result, from BSC point of view the BTS was changing state but the FSM internally was not. "Fortunately", while in state Dependency the BTS still could cope with that in order to still be operative with older osmo-bsc, so there was no major breakage, only some error log message being printed. Related: OS#4873 Change-Id: Ifd2eefc362fca0aa9e6ae102c7e6dbc1b4f295d6 --- src/common/nm_channel_fsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common') diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 263d2cc9..49259599 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -92,7 +92,7 @@ static void st_op_disabled_dependency(struct osmo_fsm_inst *fi, uint32_t event, oml_mo_opstart_nack(&ts->mo, (int)(intptr_t)data); return; case NM_EV_BBTRANSC_ENABLED: - oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE); return; default: OSMO_ASSERT(0); @@ -121,7 +121,7 @@ static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, voi oml_mo_opstart_nack(&ts->mo, (int)(intptr_t)data); return; case NM_EV_BBTRANSC_DISABLED: - oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_DEPENDENCY); return; default: OSMO_ASSERT(0); -- cgit v1.2.3