aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2021-06-15 00:28:15 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2021-06-15 00:31:24 +0200
commit519294d563ed07a2cc5ddf0c6b0c38fcc23e74f7 (patch)
tree9d04fd53cb319ab6d999a85b3543d33dcbefb41a
parenta32431972dc9ca38ad1cc192082cdc49c7eb2809 (diff)
fixup for vamos: fix wrong cbits in rsl_lchan_lookup()
The RSL_CHAN_OSMO_VAMOS_MASK mask applies to the chan_nr, but the cbits variable in rsl_lchan_lookup() is chan_nr >> 3. So the mask didn't do its job. Now it does. A bit embarrassing how i took the suggestion to use this mask and put it into code without testing it. It looked good enough... Change-Id: I005c5f319bb6f14651aeb613cdff52e79f761913
-rw-r--r--src/osmo-bsc/bts_trx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c
index f18374259..edd52be1f 100644
--- a/src/osmo-bsc/bts_trx.c
+++ b/src/osmo-bsc/bts_trx.c
@@ -170,7 +170,7 @@ struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr,
case ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Bm_ACCHs:
case ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(0):
case ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(1):
- cbits &= ~RSL_CHAN_OSMO_VAMOS_MASK;
+ cbits = (chan_nr & ~RSL_CHAN_OSMO_VAMOS_MASK) >> 3;
vamos = true;
break;
default: