diff options
| author |   Neels Hofmeyr <neels@hofmeyr.de> | 2021-04-11 14:50:12 +0000 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2021-04-11 14:50:12 +0000 |
| commit | 6cf8c691e226410b341fa9ce5ce209fd918b3073 (patch) | |
| tree | 892e7bedb8098f74df0f19cd6867d348229afc3b /src/common/oml.c | |
| parent | Revert "wip redirect OML from shadow to primary TRX" (diff) | |
| download | OsmoBTS-6cf8c691e226410b341fa9ce5ce209fd918b3073.tar.xz OsmoBTS-6cf8c691e226410b341fa9ce5ce209fd918b3073.zip | |
vamos wip
Change-Id: I38c4c5ec46c95a29bfc30a31fce3392d64cfdaaa
Diffstat (limited to 'src/common/oml.c')
| -rw-r--r-- | src/common/oml.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/common/oml.c b/src/common/oml.c index c32260bd..f836fd13 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1596,17 +1596,15 @@ gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, mo = &trx->mo; break; case NM_OC_BASEB_TRANSC: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + if (!trx) + return NULL; mo = &trx->bb_transc.mo; break; case NM_OC_CHANNEL: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + if (!trx) + return NULL; if (obj_inst->ts_nr >= TRX_NR_TS) return NULL; mo = &trx->ts[obj_inst->ts_nr].mo; @@ -1663,17 +1661,15 @@ gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, obj = trx; break; case NM_OC_BASEB_TRANSC: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + if (!trx) + return NULL; obj = &trx->bb_transc; break; case NM_OC_CHANNEL: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + if (!trx) + return NULL; if (obj_inst->ts_nr >= TRX_NR_TS) return NULL; obj = &trx->ts[obj_inst->ts_nr]; |