<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25162">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  osmith: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lchan_fsm_post_activ_ack(): return upon release<br><br>The bottom of the function changes the lchan state. If a failure branch<br>is reached, that should no longer happen. Change 'break' to 'return' in<br>four places to not mix up the channel release.<br><br>Related: SYS#5559<br>Change-Id: I4674752ab4f1c8e8147ef3366f90e9ea2abd5aec<br>---<br>M src/osmo-bsc/lchan_fsm.c<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index aa616d0..68cafb3 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -896,14 +896,14 @@</span><br><span>                                 "lchan activation for assignment succeeded, but lchan has no conn:"</span><br><span>                                " cannot trigger appropriate actions. Release.\n");</span><br><span>                      lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-                        break;</span><br><span style="color: hsl(120, 100%, 40%);">+                        return;</span><br><span>              }</span><br><span>            if (!lchan->conn->assignment.fi) {</span><br><span>                     LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span>                                   "lchan activation for assignment succeeded, but lchan has no"</span><br><span>                              " assignment ongoing: cannot trigger appropriate actions. Release.\n");</span><br><span>                  lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-                        break;</span><br><span style="color: hsl(120, 100%, 40%);">+                        return;</span><br><span>              }</span><br><span>            /* After the Chan Activ Ack, the MS expects to receive an RR Assignment Command.</span><br><span>              * Let the assignment_fsm handle that. */</span><br><span>@@ -916,14 +916,14 @@</span><br><span>                              "lchan activation for handover succeeded, but lchan has no conn:"</span><br><span>                                  " cannot trigger appropriate actions. Release.\n");</span><br><span>                      lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-                        break;</span><br><span style="color: hsl(120, 100%, 40%);">+                        return;</span><br><span>              }</span><br><span>            if (!lchan->conn->ho.fi) {</span><br><span>                     LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span>                                   "lchan activation for handover succeeded, but lchan has no"</span><br><span>                                " handover ongoing: cannot trigger appropriate actions. Release.\n");</span><br><span>                    lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-                        break;</span><br><span style="color: hsl(120, 100%, 40%);">+                        return;</span><br><span>              }</span><br><span>            /* After the Chan Activ Ack of the new lchan, send the MS an RR Handover Command on the</span><br><span>               * old channel. The handover_fsm handles that. */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25162">change 25162</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/+/25162"/><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: I4674752ab4f1c8e8147ef3366f90e9ea2abd5aec </div>
<div style="display:none"> Gerrit-Change-Number: 25162 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>