[S] Change in osmo-bts[master]: osmo-bts-sysmo: activate_rf: no dispatch on fail

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33456 ) Change subject: osmo-bts-sysmo: activate_rf: no dispatch on fail ...................................................................... osmo-bts-sysmo: activate_rf: no dispatch on fail Do not dispatch NM_EV_SW_ACT to trx->mo.fi and trx->bb_transc.mo.fi when RF-ACT.conf was not successful. Running this code path anyway looks like a leftover from when bts_shutdown used to exit osmo-bts. Change-Id: I342187604f4c72303e393ce6925b94d610bfa8fa --- M src/osmo-bts-sysmo/l1_if.c 1 file changed, 18 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 9a0b19f..0a1bbf3 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -1252,12 +1252,13 @@ LOGP(DL1C, LOGL_FATAL, "RF-ACT.conf with status %s\n", get_value_string(femtobts_l1status_names, status)); bts_shutdown(trx->bts, "RF-ACT failure"); - } else + } else { bts_update_status(BTS_STATUS_RF_ACTIVE, 1); - /* signal availability */ - osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL); - osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL); + /* signal availability */ + osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL); + osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL); + } } else { bts_update_status(BTS_STATUS_RF_ACTIVE, 0); osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_DISABLE, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I342187604f4c72303e393ce6925b94d610bfa8fa Gerrit-Change-Number: 33456 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged