aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-03-24 14:16:16 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-03-24 14:16:16 +0100
commita52f1cacb3ccc3e652c988ff0f3076488f2dfd54 (patch)
treed5a1555ea67c0bbf865487ab9d6a05d7f7a8bba6
parentf5e71415a2bbf0108eacba607717e0944a259c37 (diff)
parent9cc020ab21e2927869570f088c88782cf0d5689a (diff)
Merge remote branch 'origin/master' into on-waves/bsc-master
-rw-r--r--openbsc/src/bsc_rll.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/openbsc/src/bsc_rll.c b/openbsc/src/bsc_rll.c
index 033abb040..5c849271b 100644
--- a/openbsc/src/bsc_rll.c
+++ b/openbsc/src/bsc_rll.c
@@ -80,8 +80,7 @@ int rll_establish(struct gsm_lchan *lchan, u_int8_t sapi,
/* If we are a TCH and not in signalling mode, we need to
* indicate that the new RLL connection is to be made on the SACCH */
if ((lchan->type == GSM_LCHAN_TCH_F ||
- lchan->type == GSM_LCHAN_TCH_H) &&
- lchan->rsl_cmode != RSL_CMOD_SPD_SIGN)
+ lchan->type == GSM_LCHAN_TCH_H) && sapi != 0)
link_id |= 0x40;
use_lchan(lchan);