<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/19404">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">common: Avoid call to bts_model_chg_adm_state() if there's no ADM state change<br><br>Let's handle it in common code to simplify and avoid duplication in<br>model specific code.<br><br>Change-Id: Icea3ea1108d360193cac478f366be97ff38246d4<br>---<br>M src/common/oml.c<br>1 file changed, 6 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index 1be4f89..39304f1 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -1032,13 +1032,14 @@</span><br><span>                return oml_fom_ack_nack(msg, NM_NACK_OBJINST_UNKN);</span><br><span> </span><br><span>      /* Step 2: Do some global dependency/consistency checking */</span><br><span style="color: hsl(0, 100%, 40%);">-    if (mo->nm_state.administrative == adm_state)</span><br><span style="color: hsl(120, 100%, 40%);">+      if (mo->nm_state.administrative == adm_state) {</span><br><span>           LOGPFOH(DOML, LOGL_NOTICE, foh, "ADM state already was %s\n",</span><br><span>                      get_value_string(abis_nm_adm_state_names, adm_state));</span><br><span style="color: hsl(0, 100%, 40%);">-  else</span><br><span style="color: hsl(0, 100%, 40%);">-            LOGPFOH(DOML, LOGL_NOTICE, foh, "ADM STATE %s -> %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                    get_value_string(abis_nm_adm_state_names, mo->nm_state.administrative),</span><br><span style="color: hsl(0, 100%, 40%);">-                      get_value_string(abis_nm_adm_state_names, adm_state));</span><br><span style="color: hsl(120, 100%, 40%);">+                return oml_mo_statechg_ack(mo);</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+     LOGPFOH(DOML, LOGL_NOTICE, foh, "ADM STATE %s -> %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+          get_value_string(abis_nm_adm_state_names, mo->nm_state.administrative),</span><br><span style="color: hsl(120, 100%, 40%);">+            get_value_string(abis_nm_adm_state_names, adm_state));</span><br><span> </span><br><span>   /* Step 3: Ask BTS driver to apply the state chg */</span><br><span>  return bts_model_chg_adm_state(bts, mo, obj, adm_state);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/19404">change 19404</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-bts/+/19404"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Icea3ea1108d360193cac478f366be97ff38246d4 </div>
<div style="display:none"> Gerrit-Change-Number: 19404 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </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>