diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2021-04-10 14:26:12 +0000 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2021-04-10 14:26:12 +0000 |
| commit | deac00dc80bb0a076ac5524cc935aecc14832251 (patch) | |
| tree | 75d82eac46877092f152e1591c6129670557e9c9 | |
| parent | c3acd1958310089296f10a70bd4e144c7f91ecdd (diff) | |
Revert "wip redirect OML from shadow to primary TRX"
This reverts commit c3acd1958310089296f10a70bd4e144c7f91ecdd.
| -rw-r--r-- | src/common/oml.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/common/oml.c b/src/common/oml.c index e2638a6a..c32260bd 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -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: |