[MERGED] openbsc[master]: OM2000: use assoc_so *only* for TS objects

Harald Welte gerrit-no-reply at lists.osmocom.org
Wed Feb 1 16:36:11 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: OM2000: use assoc_so *only* for TS objects
......................................................................


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
---
M openbsc/src/libbsc/abis_om2000.c
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Holger Freyther: Looks good to me, approved



diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c
index 6b334d4..6c987d8 100644
--- a/openbsc/src/libbsc/abis_om2000.c
+++ b/openbsc/src/libbsc/abis_om2000.c
@@ -803,7 +803,7 @@
 
 	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 @@
 		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 @@
 	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)

-- 
To view, visit https://gerrit.osmocom.org/1715
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0a31cd93993da10f31eecf530a5a05773c11eb1
Gerrit-PatchSet: 3
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder


More information about the gerrit-log mailing list