cellular-infrastructure
/
osmo-mgw
mirror of https://gerrit.osmocom.org/osmo-mgw
10
0
Fork 0
Code Issues Releases Wiki Activity

abis_nm wants to use bts->bts_nr (the number of the BTS in the OML link) rather 

than bts->nr (the number of the BTS in the BSC).
This commit is contained in:
Harald Welte 2009-05-01 13:20:04 +00:00
parent aeedeb41dd
commit 191280d04b
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/abis_nm.c
View File

@ -1435,7 +1435,7 @@ int abis_nm_set_bts_attr(struct gsm_bts *bts, u_int8_t *attr, int attr_len)
DEBUGP(DNM, "Set BTS Attr (bts=%d)\n", bts->nr);
oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE);
fill_om_fom_hdr(oh, attr_len, NM_MT_SET_BTS_ATTR, NM_OC_BTS, bts->nr, 0xff, 0xff);
fill_om_fom_hdr(oh, attr_len, NM_MT_SET_BTS_ATTR, NM_OC_BTS, bts->bts_nr, 0xff, 0xff);
cur = msgb_put(msg, attr_len);
memcpy(cur, attr, attr_len);
@ -1453,7 +1453,7 @@ int abis_nm_set_radio_attr(struct gsm_bts_trx *trx, u_int8_t *attr, int attr_len
oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE);
fill_om_fom_hdr(oh, attr_len, NM_MT_SET_RADIO_ATTR, NM_OC_RADIO_CARRIER,
trx->bts->nr, trx->nr, 0xff);
trx->bts->bts_nr, trx->nr, 0xff);
cur = msgb_put(msg, attr_len);
memcpy(cur, attr, attr_len);

18
src/bsc_hack.c
View File

@ -383,9 +383,9 @@ int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj,
abis_nm_set_bts_attr(bts, nanobts_attr_bts,
sizeof(nanobts_attr_bts));
abis_nm_opstart(bts, NM_OC_BTS,
bts->nr, 0xff, 0xff);
bts->bts_nr, 0xff, 0xff);
abis_nm_chg_adm_state(bts, NM_OC_BTS,
bts->nr, 0xff, 0xff,
bts->bts_nr, 0xff, 0xff,
NM_STATE_UNLOCKED);
}
break;
@ -395,9 +395,9 @@ int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj,
abis_nm_set_radio_attr(trx, nanobts_attr_radio,
sizeof(nanobts_attr_radio));
abis_nm_opstart(trx->bts, NM_OC_RADIO_CARRIER,
trx->bts->nr, trx->nr, 0xff);
trx->bts->bts_nr, trx->nr, 0xff);
abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER,
trx->bts->nr, trx->nr, 0xff,
trx->bts->bts_nr, trx->nr, 0xff,
NM_STATE_UNLOCKED);
}
break;
@ -410,9 +410,9 @@ int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj,
else
abis_nm_set_channel_attr(ts, NM_CHANC_TCHFull);
abis_nm_opstart(trx->bts, NM_OC_CHANNEL,
trx->bts->nr, trx->nr, ts->nr);
trx->bts->bts_nr, trx->nr, ts->nr);
abis_nm_chg_adm_state(trx->bts, NM_OC_CHANNEL,
trx->bts->nr, trx->nr, ts->nr,
trx->bts->bts_nr, trx->nr, ts->nr,
NM_STATE_UNLOCKED);
}
break;
@ -420,12 +420,12 @@ int nm_state_event(enum nm_evt evt, u_int8_t obj_class, void *obj,
trx = container_of(obj, struct gsm_bts_trx, bb_transc);
if (new_state->availability == 5) {
abis_nm_ipaccess_msg(trx->bts, 0xe0, NM_OC_BASEB_TRANSC,
trx->bts->nr, trx->nr, 0xff,
trx->bts->bts_nr, trx->nr, 0xff,
nanobts_attr_e0, sizeof(nanobts_attr_e0));
abis_nm_opstart(trx->bts, NM_OC_BASEB_TRANSC,
trx->bts->nr, trx->nr, 0xff);
trx->bts->bts_nr, trx->nr, 0xff);
abis_nm_chg_adm_state(trx->bts, NM_OC_BASEB_TRANSC,
trx->bts->nr, trx->nr, 0xff,
trx->bts->bts_nr, trx->nr, 0xff,
NM_STATE_UNLOCKED);
}
break;