laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/32190 )
Change subject: ipaccess nm: Delay marking TS as usable until OML reports
Enabled state
......................................................................
ipaccess nm: Delay marking TS as usable until OML reports Enabled state
The BTS can immediatelly ACK the OPSTART, but that doesn't mean the TS
is already usable. It should only be used when the BTS reports it is in
Enabled state.
Related: OS#5973
Change-Id: I712aa22252d29ceea152c25a5da75542e1691faf
---
M src/osmo-bsc/bts_ipaccess_nanobts.c
M src/osmo-bsc/nm_channel_fsm.c
2 files changed, 17 insertions(+), 1 deletion(-)
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 1a57deb..14d4d52 100644
--- a/src/osmo-bsc/bts_ipaccess_nanobts.c
+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c
@@ -254,7 +254,6 @@
return;
}
osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_ACK, NULL);
- osmo_fsm_inst_dispatch(ts->fi, TS_EV_OML_READY, NULL);
}
static void nm_rx_opstart_ack(struct msgb *oml_msg)
diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c
index 45e455a..f1bcbf0 100644
--- a/src/osmo-bsc/nm_channel_fsm.c
+++ b/src/osmo-bsc/nm_channel_fsm.c
@@ -35,6 +35,7 @@
#include <osmocom/bsc/ipaccess.h>
#include <osmocom/bsc/nm_common_fsm.h>
#include <osmocom/bsc/debug.h>
+#include <osmocom/bsc/timeslot_fsm.h>
#define X(s) (1 << (s))
@@ -239,6 +240,8 @@
ts->mo.adm_unlock_sent = false;
ts->mo.set_attr_ack_received = false;
ts->mo.set_attr_sent = false;
+
+ osmo_fsm_inst_dispatch(ts->fi, TS_EV_OML_READY, NULL);
}
static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32190
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I712aa22252d29ceea152c25a5da75542e1691faf
Gerrit-Change-Number: 32190
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
