cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

Revert "wip redirect OML from shadow to primary TRX" 

This reverts commit c3acd19583.
This commit is contained in:
Neels Hofmeyr 2021-04-10 14:26:12 +00:00
parent c3acd19583
commit deac00dc80
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/oml.c
View File

@ -1583,7 +1583,6 @@ gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class,
{
struct gsm_bts_trx *trx;
struct gsm_abis_mo *mo = NULL;
uint8_t primary_trx_nr;
switch (obj_class) {
case NM_OC_BTS:
@ -1597,15 +1596,10 @@ gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class,
mo = &trx->mo;
break;
case NM_OC_BASEB_TRANSC:
primary_trx_nr = obj_inst->trx_nr;
if (osmo_bts_has_feature(bts->features, BTS_FEAT_VAMOS)) {
/* For shadow TRX, also use the primary TRX number */
primary_trx_nr &= 0x7f;
}
if (primary_trx_nr >= bts->num_trx) {
if (obj_inst->trx_nr >= bts->num_trx) {
return NULL;
}
trx = gsm_bts_trx_num(bts, primary_trx_nr);
trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
mo = &trx->bb_transc.mo;
break;
case NM_OC_CHANNEL: