Change in osmo-bsc[master]: lchan_fsm_post_activ_ack(): return upon release

[neels]

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25162 )

Change subject: lchan_fsm_post_activ_ack(): return upon release
......................................................................

lchan_fsm_post_activ_ack(): return upon release

The bottom of the function changes the lchan state. If a failure branch
is reached, that should no longer happen. Change 'break' to 'return' in
four places to not mix up the channel release.

Related: SYS#5559
Change-Id: I4674752ab4f1c8e8147ef3366f90e9ea2abd5aec
---
M src/osmo-bsc/lchan_fsm.c
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  osmith: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index aa616d0..68cafb3 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -896,14 +896,14 @@
 				  "lchan activation for assignment succeeded, but lchan has no conn:"
 				  " cannot trigger appropriate actions. Release.\n");
 			lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL, NULL);
-			break;
+			return;
 		}
 		if (!lchan->conn->assignment.fi) {
 			LOG_LCHAN(lchan, LOGL_ERROR,
 				  "lchan activation for assignment succeeded, but lchan has no"
 				  " assignment ongoing: cannot trigger appropriate actions. Release.\n");
 			lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL, NULL);
-			break;
+			return;
 		}
 		/* After the Chan Activ Ack, the MS expects to receive an RR Assignment Command.
 		 * Let the assignment_fsm handle that. */
@@ -916,14 +916,14 @@
 				  "lchan activation for handover succeeded, but lchan has no conn:"
 				  " cannot trigger appropriate actions. Release.\n");
 			lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL, NULL);
-			break;
+			return;
 		}
 		if (!lchan->conn->ho.fi) {
 			LOG_LCHAN(lchan, LOGL_ERROR,
 				  "lchan activation for handover succeeded, but lchan has no"
 				  " handover ongoing: cannot trigger appropriate actions. Release.\n");
 			lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL, NULL);
-			break;
+			return;
 		}
 		/* After the Chan Activ Ack of the new lchan, send the MS an RR Handover Command on the
 		 * old channel. The handover_fsm handles that. */

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25162
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I4674752ab4f1c8e8147ef3366f90e9ea2abd5aec
Gerrit-Change-Number: 25162
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210816/b47a733d/attachment.htm>