From 20703eb9dcf0d814bb0a7d2dc5c84ffd3f9f8378 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 9 Sep 2018 17:21:50 +0200 Subject: 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 --- src/osmo-bsc/system_information.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/osmo-bsc') diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 232a1b6a0..2104e9272 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -963,7 +963,7 @@ static int generate_si4(enum osmo_sysinfo_type t, struct gsm_bts *bts) 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; -- cgit v1.2.3