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
This commit is contained in:
Harald Welte 2018-09-09 17:21:50 +02:00
parent 24286f37b7
commit 20703eb9dc
1 changed files with 1 additions and 1 deletions

View File

@ -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;