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
This commit is contained in:
Harald Welte 2016-11-15 22:09:08 +01:00
parent 725f3f1de0
commit 2d02775b91
1 changed files with 4 additions and 4 deletions

View File

@ -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)