[MERGED] openbsc[master]: gsm_pchan2chan_nr(): fix uninitialized cbits

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: gsm_pchan2chan_nr(): fix uninitialized cbits
......................................................................


gsm_pchan2chan_nr(): fix uninitialized cbits

Commit ec1b5a0e9e2b6549e0ede48e803095e569997355 introduced an unset cbits
value for the 'special hack for BCCH', where I break out of the switch
without setting cbits. Fix that.

Also remove the comment part that says 'return 0', because I don't return 0.

Change-Id: I54129d921807971eeafc23f80c57666c67b71377
---
M openbsc/src/libcommon/gsm_data_shared.c
1 file changed, 5 insertions(+), 6 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/openbsc/src/libcommon/gsm_data_shared.c
index 529f72c..2488c3a 100644
--- a/openbsc/src/libcommon/gsm_data_shared.c
+++ b/openbsc/src/libcommon/gsm_data_shared.c
@@ -573,14 +573,13 @@
 	case GSM_PCHAN_CCCH_SDCCH4_CBCH:
 		/*
 		 * As a special hack for BCCH, lchan_nr == 4 may be passed
-		 * here. This should never be sent in an RSL message, so just
-		 * return 0. See osmo-bts-xxx/oml.c:opstart_compl().
+		 * here. This should never be sent in an RSL message.
+		 * See osmo-bts-xxx/oml.c:opstart_compl().
 		 */
-		if (lchan_nr == 4) {
+		if (lchan_nr == 4)
 			chan_nr = 0;
-			break;
-		}
-		OSMO_ASSERT(lchan_nr < 4);
+		else
+			OSMO_ASSERT(lchan_nr < 4);
 		cbits = 0x04;
 		cbits += lchan_nr;
 		break;

-- 
To view, visit https://gerrit.osmocom.org/684
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I54129d921807971eeafc23f80c57666c67b71377
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: neels_test_account <neels at hofmeyr.de>