pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/21625 )
Change subject: nm_channel_fsm: Fix several FSM internal transitions not being
made
......................................................................
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
---
M src/common/nm_channel_fsm.c
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
fixeria: Looks good to me, approved; Verified
Jenkins Builder: Verified
diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c
index 263d2cc..4925959 100644
--- a/src/common/nm_channel_fsm.c
+++ b/src/common/nm_channel_fsm.c
@@ -92,7 +92,7 @@
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 @@
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);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21625
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ifd2eefc362fca0aa9e6ae102c7e6dbc1b4f295d6
Gerrit-Change-Number: 21625
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pes...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
