From 2d02775b919d4d56b960cd76b792db95aee539dc Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 15 Nov 2016 22:09:08 +0100 Subject: OM2000: use assoc_so *only* for TS objects all other objects always use the MO instance. The existing code likely is due to copy+paste mistakes. Change-Id: Ie0a31cd93993da10f31eecf530a5a05773c11eb1 --- openbsc/src/libbsc/abis_om2000.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c index 6b334d4e6..6c987d8d2 100644 --- a/openbsc/src/libbsc/abis_om2000.c +++ b/openbsc/src/libbsc/abis_om2000.c @@ -803,7 +803,7 @@ mo2nm_state(struct gsm_bts *bts, const struct abis_om2k_mo *mo) switch (mo->class) { case OM2K_MO_CLS_TRXC: - trx = gsm_bts_trx_num(bts, mo->assoc_so); + trx = gsm_bts_trx_num(bts, mo->inst); if (!trx) return NULL; nm_state = &trx->mo.nm_state; @@ -832,12 +832,12 @@ mo2nm_state(struct gsm_bts *bts, const struct abis_om2k_mo *mo) nm_state = &bts->mo.nm_state; break; case OM2K_MO_CLS_TX: - trx = gsm_bts_trx_num(bts, mo->assoc_so); + trx = gsm_bts_trx_num(bts, mo->inst); if (!trx) return NULL; break; case OM2K_MO_CLS_RX: - trx = gsm_bts_trx_num(bts, mo->assoc_so); + trx = gsm_bts_trx_num(bts, mo->inst); if (!trx) return NULL; break; @@ -854,7 +854,7 @@ static void *mo2obj(struct gsm_bts *bts, struct abis_om2k_mo *mo) case OM2K_MO_CLS_TX: case OM2K_MO_CLS_RX: case OM2K_MO_CLS_TRXC: - return gsm_bts_trx_num(bts, mo->assoc_so); + return gsm_bts_trx_num(bts, mo->inst); case OM2K_MO_CLS_TS: trx = gsm_bts_trx_num(bts, mo->assoc_so); if (!trx) -- cgit v1.2.3