Change in osmo-bsc[master]: CBCH: Fix SI4 CBCH IE generation

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10854 )

Change subject: CBCH: Fix SI4 CBCH IE generation
......................................................................

CBCH: Fix SI4 CBCH IE generation

When a CBCH is present in the cell, SI4 contains the channel description
of the CBCH.  As SI4 may be generated at a time when the underlying
timeslot is not configured yet, we need to generate the channel
description for the _configured_ channel combination, not the currently
used one.

Change-Id: Idbf9b8e4b1ef0e0348580b83f91355b3236d8609
Closes: OS#3532
---
M src/osmo-bsc/system_information.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c
index 232a1b6..2104e92 100644
--- a/src/osmo-bsc/system_information.c
+++ b/src/osmo-bsc/system_information.c
@@ -963,7 +963,7 @@
 	cbch_lchan = gsm_bts_get_cbch(bts);
 	if (cbch_lchan) {
 		struct gsm48_chan_desc cd;
-		gsm48_lchan2chan_desc(&cd, cbch_lchan);
+		gsm48_lchan2chan_desc_as_configured(&cd, cbch_lchan);
 		tv_fixed_put(si4->data, GSM48_IE_CBCH_CHAN_DESC, 3,
 			     (uint8_t *) &cd);
 		l2_plen += 3 + 1;

-- 
To view, visit https://gerrit.osmocom.org/10854
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Idbf9b8e4b1ef0e0348580b83f91355b3236d8609
Gerrit-Change-Number: 10854
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180909/1b5d4b7b/attachment.htm>