diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-10-22 13:18:15 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-10-22 13:18:23 +0200 |
| commit | 34018dd4c9a192d7a9b8568ed41d4ed9a35bf0f2 (patch) | |
| tree | 4b0566a646782ef5bacdb8e792bb59d6381a6507 /src | |
| parent | e6ce1718aea468e1995fd6d6a4048e894d6a7ddb (diff) | |
Convert lchan CCCH_LCHAN to chan_nr BCCH and viceversa
Before this patch it was being coded as SDCCH4 TS0 SS 0, and as a
result the state LCHAN_REL_ACT_OML applied in opstart_compl in abused
SDCCH4 TS0 SS 4 was not being checked when deciding whether to send a
Chan Act ACK in rsl_tx_chan_act_acknack.
Fixes: OS#3513
Change-Id: I1641960c9ffbb3ed0de74ab5b53e24e5b4ff3397
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/gsm_data_shared.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 8c3229c3..588d0fdd 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -622,11 +622,12 @@ uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan, * See osmo-bts-xxx/oml.c:opstart_compl(). */ if (lchan_nr == CCCH_LCHAN) - lchan_nr = 0; - else + cbits = 0x10; /* BCCH */ + else { OSMO_ASSERT(lchan_nr < 4); - cbits = 0x04; - cbits += lchan_nr; + cbits = 0x04; + cbits += lchan_nr; + } break; case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: |