aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@espeweb.net>2020-12-09 14:01:27 +0100
committerPau Espin Pedrol <pespin@espeweb.net>2020-12-09 14:04:19 +0100
commit2b416d6d2b7b86fc04a8478f7a1a205d05349d24 (patch)
tree925c9735b1c4c8fa79393708107407fbf2f25cff
parentrsl: properly initialize MS/BS Power Control state (diff)
downloadOsmoBTS-2b416d6d2b7b86fc04a8478f7a1a205d05349d24.tar.xz
OsmoBTS-2b416d6d2b7b86fc04a8478f7a1a205d05349d24.zip
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
-rw-r--r--src/common/nm_channel_fsm.c4
1 files changed, 2 insertions, 2 deletions
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);