path: root/src/osmo-bts-sysmo/l1_if.c
diff options
authorHarald Welte <laforge@gnumonks.org>2018-02-26 13:12:20 +0100
committerHarald Welte <laforge@gnumonks.org>2018-02-26 13:48:11 +0100
commitbcc20a871c61c9ab6188d6abe183dbced7ac241f (patch)
tree474a078f80e6e7d585d85fe1007cec2e12ee5a43 /src/osmo-bts-sysmo/l1_if.c
parent591c8993e9533da419fe1d995748b545a374416f (diff)
{sysmo,lc15}: Fix RACH reporting in combined CBCH case
Combined CCCH with CBCH is a separate PCHAN type and hence we must accept it in the list of RACH-carrying pchan types in order to correctly report the RACH chan_nr when handing RACH requests up to L1SAP. The bug this fixes likely might have rendered cells with combined CBCH impossible to use. Change-Id: I9537463e5eedd2b8b30f298e0d3b308367c5b1fb
Diffstat (limited to 'src/osmo-bts-sysmo/l1_if.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 3638f113..396d1c2f 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -1066,7 +1066,8 @@ static int handle_ph_ra_ind(struct femtol1_hdl *fl1, GsmL1_PhRaInd_t *ra_ind,
if (!lchan || lchan->ts->pchan == GSM_PCHAN_CCCH ||
- lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4)
+ lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||
+ lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)
l1sap->u.rach_ind.chan_nr = 0x88;
l1sap->u.rach_ind.chan_nr = gsm_lchan2chan_nr(lchan);