summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-10-31 18:16:34 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-11-07 15:18:25 +0100
commitae36a7afa0e9c3fa933cb0e1f9ca70b35bcdda67 (patch)
tree897f789403802c686d46d0002935f961ec35ba27
parent5864c3449b66ef869c1f53f0f9b8c79d8c5d24d2 (diff)
abis_om2000: for TS conf of dyn TS, always send TCH/F as chan combneels/om2000
-rw-r--r--openbsc/src/libbsc/abis_om2000.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c
index 357e2e5..b9d8b69 100644
--- a/openbsc/src/libbsc/abis_om2000.c
+++ b/openbsc/src/libbsc/abis_om2000.c
@@ -1264,12 +1264,8 @@ static uint8_t ts2comb(struct gsm_bts_trx_ts *ts)
{
switch (ts->pchan) {
case GSM_PCHAN_TCH_F_PDCH:
- if (ts->flags & TS_F_PDCH_ACTIVE)
- return pchan2comb(GSM_PCHAN_PDCH);
- else
- return pchan2comb(GSM_PCHAN_TCH_F);
case GSM_PCHAN_TCH_F_TCH_H_PDCH:
- return pchan2comb(ts->dyn.pchan_is);
+ return pchan2comb(GSM_PCHAN_TCH_F);
default:
return pchan2comb(ts->pchan);
}