<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21607">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NM FSMs: fix DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED<br><br>This state transaction does not make sense, let's avoid it.<br><br>Change-Id: I24a78905bb684f8501dc5ade0605662ec283febc<br>Related: OS#4901<br>---<br>M src/osmo-bsc/nm_bb_transc_fsm.c<br>M src/osmo-bsc/nm_bts_fsm.c<br>M src/osmo-bsc/nm_bts_sm_fsm.c<br>M src/osmo-bsc/nm_channel_fsm.c<br>M src/osmo-bsc/nm_gprs_cell_fsm.c<br>M src/osmo-bsc/nm_gprs_nse_fsm.c<br>M src/osmo-bsc/nm_gprs_nsvc_fsm.c<br>M src/osmo-bsc/nm_rcarrier_fsm.c<br>8 files changed, 16 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c</span><br><span>index 31e5f34..2fb52f9 100644</span><br><span>--- a/src/osmo-bsc/nm_bb_transc_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_bb_transc_fsm.c</span><br><span>@@ -287,7 +287,8 @@</span><br><span> bb_transc->mo.opstart_sent = false;</span><br><span> break;</span><br><span> case NM_EV_OML_DOWN:</span><br><span style="color: hsl(0, 100%, 40%);">- nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fi->state != NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(0);</span><br><span>diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c</span><br><span>index c951edd..329d911 100644</span><br><span>--- a/src/osmo-bsc/nm_bts_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_bts_fsm.c</span><br><span>@@ -315,7 +315,8 @@</span><br><span> bts->mo.opstart_sent = false;</span><br><span> break;</span><br><span> case NM_EV_OML_DOWN:</span><br><span style="color: hsl(0, 100%, 40%);">- nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fi->state != NM_BTS_ST_OP_DISABLED_NOTINSTALLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(0);</span><br><span>diff --git a/src/osmo-bsc/nm_bts_sm_fsm.c b/src/osmo-bsc/nm_bts_sm_fsm.c</span><br><span>index 815eea6..1bb182d 100644</span><br><span>--- a/src/osmo-bsc/nm_bts_sm_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_bts_sm_fsm.c</span><br><span>@@ -212,7 +212,8 @@</span><br><span> site_mgr->mo.opstart_sent = false;</span><br><span> break;</span><br><span> case NM_EV_OML_DOWN:</span><br><span style="color: hsl(0, 100%, 40%);">- nm_bts_sm_fsm_state_chg(fi, NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fi->state != NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_bts_sm_fsm_state_chg(fi, NM_BTS_SM_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(0);</span><br><span>diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c</span><br><span>index 620051a..31b8c03 100644</span><br><span>--- a/src/osmo-bsc/nm_channel_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_channel_fsm.c</span><br><span>@@ -283,7 +283,8 @@</span><br><span> ts->mo.opstart_sent = false;</span><br><span> break;</span><br><span> case NM_EV_OML_DOWN:</span><br><span style="color: hsl(0, 100%, 40%);">- nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fi->state != NM_CHAN_ST_OP_DISABLED_NOTINSTALLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(0);</span><br><span>@@ -296,7 +297,6 @@</span><br><span> X(NM_EV_SW_ACT_REP) |</span><br><span> X(NM_EV_STATE_CHG_REP),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(0, 100%, 40%);">- X(NM_CHAN_ST_OP_DISABLED_NOTINSTALLED) |</span><br><span> X(NM_CHAN_ST_OP_DISABLED_DEPENDENCY) |</span><br><span> X(NM_CHAN_ST_OP_DISABLED_OFFLINE) |</span><br><span> X(NM_CHAN_ST_OP_ENABLED),</span><br><span>diff --git a/src/osmo-bsc/nm_gprs_cell_fsm.c b/src/osmo-bsc/nm_gprs_cell_fsm.c</span><br><span>index aac4ca3..4df3a3e 100644</span><br><span>--- a/src/osmo-bsc/nm_gprs_cell_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_gprs_cell_fsm.c</span><br><span>@@ -292,7 +292,8 @@</span><br><span> cell->mo.force_rf_lock ? NM_STATE_LOCKED : NM_STATE_UNLOCKED);</span><br><span> break;</span><br><span> case NM_EV_OML_DOWN:</span><br><span style="color: hsl(0, 100%, 40%);">- nm_gprs_cell_fsm_state_chg(fi, NM_GPRS_CELL_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fi->state != NM_GPRS_CELL_ST_OP_DISABLED_NOTINSTALLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_gprs_cell_fsm_state_chg(fi, NM_GPRS_CELL_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(0);</span><br><span>diff --git a/src/osmo-bsc/nm_gprs_nse_fsm.c b/src/osmo-bsc/nm_gprs_nse_fsm.c</span><br><span>index 497b43c..8a63f56 100644</span><br><span>--- a/src/osmo-bsc/nm_gprs_nse_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_gprs_nse_fsm.c</span><br><span>@@ -294,7 +294,8 @@</span><br><span> nse->mo.force_rf_lock ? NM_STATE_LOCKED : NM_STATE_UNLOCKED);</span><br><span> break;</span><br><span> case NM_EV_OML_DOWN:</span><br><span style="color: hsl(0, 100%, 40%);">- nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fi->state != NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_gprs_nse_fsm_state_chg(fi, NM_GPRS_NSE_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(0);</span><br><span>diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c</span><br><span>index 2a57ada..5f0c5de 100644</span><br><span>--- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c</span><br><span>@@ -303,7 +303,8 @@</span><br><span> nsvc->mo.opstart_sent = false;</span><br><span> break;</span><br><span> case NM_EV_OML_DOWN:</span><br><span style="color: hsl(0, 100%, 40%);">- nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fi->state != NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_gprs_nsvc_fsm_state_chg(fi, NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(0);</span><br><span>diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c</span><br><span>index 8702ebe..4bb62fc 100644</span><br><span>--- a/src/osmo-bsc/nm_rcarrier_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_rcarrier_fsm.c</span><br><span>@@ -278,7 +278,8 @@</span><br><span> trx->mo.force_rf_lock ? NM_STATE_LOCKED : NM_STATE_UNLOCKED);</span><br><span> break;</span><br><span> case NM_EV_OML_DOWN:</span><br><span style="color: hsl(0, 100%, 40%);">- nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fi->state != NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED)</span><br><span style="color: hsl(120, 100%, 40%);">+ nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21607">change 21607</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/21607"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I24a78905bb684f8501dc5ade0605662ec283febc </div>
<div style="display:none"> Gerrit-Change-Number: 21607 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>