laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/32191 )
Change subject: ipaccess nm: Handle TS_EV_OML_DOWN through NM FSM
......................................................................
ipaccess nm: Handle TS_EV_OML_DOWN through NM FSM
This way we have much more control on where the events are expected to
happen.
Related: OS#5973
Change-Id: I314b8bbd8721b0420aa4a2a4da9e911834853324
---
M src/osmo-bsc/bts_ipaccess_nanobts.c
M src/osmo-bsc/nm_channel_fsm.c
2 files changed, 16 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c
b/src/osmo-bsc/bts_ipaccess_nanobts.c
index 14d4d52..83c8097 100644
--- a/src/osmo-bsc/bts_ipaccess_nanobts.c
+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c
@@ -636,8 +636,6 @@
for (i = 0; i < ARRAY_SIZE(bts->site_mgr->gprs.nsvc); i++)
osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nsvc[i].mo.fi,
NM_EV_OML_DOWN, NULL);
- gsm_bts_all_ts_dispatch(bts, TS_EV_OML_DOWN, NULL);
-
bts->ip_access.flags = 0;
/* Reset the feature vector */
diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c
index f1bcbf0..e80d591 100644
--- a/src/osmo-bsc/nm_channel_fsm.c
+++ b/src/osmo-bsc/nm_channel_fsm.c
@@ -286,8 +286,10 @@
ts->mo.opstart_sent = false;
break;
case NM_EV_OML_DOWN:
- if (fi->state != NM_CHAN_ST_OP_DISABLED_NOTINSTALLED)
+ if (fi->state != NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) {
+ osmo_fsm_inst_dispatch(ts->fi, TS_EV_OML_DOWN, NULL);
nm_chan_fsm_state_chg(fi,
NM_CHAN_ST_OP_DISABLED_NOTINSTALLED);
+ }
break;
default:
OSMO_ASSERT(0);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32191
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I314b8bbd8721b0420aa4a2a4da9e911834853324
Gerrit-Change-Number: 32191
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-MessageType: merged
