aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2013-01-08 19:30:14 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2013-01-08 19:30:14 +0100
commit608ac2a8a41ed302f5c51f7588afdaeb6d27c6b4 (patch)
tree14f2bb3aa4e3f0e6fb9abb64864731ab4ff09b7b
parentbac7dcc36751f6b49f5715112f8bab74a2f224a7 (diff)
abis: Fix the verification of BCCH/SDCCH8 on TRX != 0 for the BS11
The SDCCH8 is only allowed on trx 0 if there is no BCCH/SDCCH4 on it.
-rw-r--r--openbsc/src/libbsc/abis_nm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c
index b74e77263..adc2362fa 100644
--- a/openbsc/src/libbsc/abis_nm.c
+++ b/openbsc/src/libbsc/abis_nm.c
@@ -1507,7 +1507,7 @@ static int verify_chan_comb(struct gsm_bts_trx_ts *ts, uint8_t chan_comb,
/* not on the same TRX that has a BCCH+SDCCH4
* combination */
- if (ts->trx == ts->trx->bts->c0 &&
+ if (ts->trx != ts->trx->bts->c0 &&
(ts->trx->ts[0].nm_chan_comb == 5 ||
ts->trx->ts[0].nm_chan_comb == 8)) {
*reason = "SDCCH/8 and BCCH must be on the same TRX.";