Change in osmo-bts[master]: conf_lchans_as_pchan(): fix GSM_LCHAN_{CCCH->CBCH} regression

fixeria gerrit-no-reply at lists.osmocom.org
Tue Jun 8 08:36:26 UTC 2021


fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24603 )

Change subject: conf_lchans_as_pchan(): fix GSM_LCHAN_{CCCH->CBCH} regression
......................................................................

conf_lchans_as_pchan(): fix GSM_LCHAN_{CCCH->CBCH} regression

This regression was introduced (by me) in [1] and broke CCCH.

Change-Id: I403ad06574a8505b69dd06781f7fe0f7cabf416f
Fixes: [1] I1c5a033e89d9ca5fb01ebe9ffb521fd67d159bee
Related: SYS#4895, OS#4941
---
M src/common/oml.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved



diff --git a/src/common/oml.c b/src/common/oml.c
index 0e7fbd5..6acc6b1 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -834,7 +834,7 @@
 			ts->lchan[2].type = GSM_LCHAN_CBCH;
 		/* fallthrough */
 	case GSM_PCHAN_CCCH:
-		ts->lchan[CCCH_LCHAN].type = GSM_LCHAN_CBCH;
+		ts->lchan[CCCH_LCHAN].type = GSM_LCHAN_CCCH;
 		break;
 	case GSM_PCHAN_TCH_F:
 		if (ts->vamos.peer != NULL) { /* VAMOS: enable shadow lchans */

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I403ad06574a8505b69dd06781f7fe0f7cabf416f
Gerrit-Change-Number: 24603
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210608/385ce67f/attachment.htm>


More information about the gerrit-log mailing list