pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39139?usp=email )
Change subject: Use correct bts_nr field during MO init ......................................................................
Use correct bts_nr field during MO init
We want to transmit the BTS nr inside the E1 link, not the internal BTS number in osmo-bsc.
Change-Id: I8a70c61cef74c0febeefae88dee575fbb4936d3e --- M src/osmo-bsc/bts.c M src/osmo-bsc/bts_sm.c M src/osmo-bsc/bts_trx.c 3 files changed, 8 insertions(+), 8 deletions(-)
Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve
diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 9febe35..dd60ef8 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -225,7 +225,7 @@ bts->mo.fi = osmo_fsm_inst_alloc(&nm_bts_fsm, bts, bts, LOGL_INFO, NULL); osmo_fsm_inst_update_id_f(bts->mo.fi, "bts%d", bts->nr); - gsm_mo_init(&bts->mo, bts, NM_OC_BTS, bts->nr, 0xff, 0xff); + gsm_mo_init(&bts->mo, bts, NM_OC_BTS, bts->bts_nr, 0xff, 0xff);
/* 3GPP TS 08.18, chapter 5.4.1: 0 is reserved for signalling */ bts->gprs.cell.bvci = 2; @@ -237,7 +237,7 @@ &bts->gprs.cell, LOGL_INFO, NULL); osmo_fsm_inst_update_id_f(bts->gprs.cell.mo.fi, "gprs-cell%d", bts->nr); gsm_mo_init(&bts->gprs.cell.mo, bts, NM_OC_GPRS_CELL, - bts->nr, 0xff, 0xff); + bts->bts_nr, 0xff, 0xff);
/* init statistics */ bts->bts_ctrs = rate_ctr_group_alloc(bts, &bts_ctrg_desc, bts->nr); diff --git a/src/osmo-bsc/bts_sm.c b/src/osmo-bsc/bts_sm.c index d122369..c55c33c 100644 --- a/src/osmo-bsc/bts_sm.c +++ b/src/osmo-bsc/bts_sm.c @@ -75,7 +75,7 @@ bts_sm->gprs.nse.mo.fi = osmo_fsm_inst_alloc(&nm_gprs_nse_fsm, bts_sm, &bts_sm->gprs.nse, LOGL_INFO, NULL); osmo_fsm_inst_update_id_f(bts_sm->gprs.nse.mo.fi, "nse%d", bts_num); - gsm_mo_init(&bts_sm->gprs.nse.mo, bts, NM_OC_GPRS_NSE, bts->nr, 0xff, 0xff); + gsm_mo_init(&bts_sm->gprs.nse.mo, bts, NM_OC_GPRS_NSE, bts->bts_nr, 0xff, 0xff); memcpy(&bts_sm->gprs.nse.timer, bts_nse_timer_default, sizeof(bts_sm->gprs.nse.timer));
@@ -89,12 +89,12 @@ osmo_fsm_inst_update_id_f(bts_sm->gprs.nsvc[i].mo.fi, "nsvc%d", i); gsm_mo_init(&bts_sm->gprs.nsvc[i].mo, bts, NM_OC_GPRS_NSVC, - bts->nr, i, 0xff); + bts->bts_nr, i, 0xff); } memcpy(&bts_sm->gprs.nse.timer, bts_nse_timer_default, sizeof(bts_sm->gprs.nse.timer)); gsm_mo_init(&bts_sm->gprs.nse.mo, bts, NM_OC_GPRS_NSE, - bts->nr, 0xff, 0xff); + bts->bts_nr, 0xff, 0xff);
return bts_sm; } diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c index 4d2588d..e3d7612 100644 --- a/src/osmo-bsc/bts_trx.c +++ b/src/osmo-bsc/bts_trx.c @@ -75,13 +75,13 @@ LOGL_INFO, NULL); osmo_fsm_inst_update_id_f(trx->mo.fi, "bts%d-trx%d", bts->nr, trx->nr); gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, - bts->nr, trx->nr, 0xff); + bts->bts_nr, trx->nr, 0xff);
trx->bb_transc.mo.fi = osmo_fsm_inst_alloc(&nm_bb_transc_fsm, trx, &trx->bb_transc, LOGL_INFO, NULL); osmo_fsm_inst_update_id_f(trx->bb_transc.mo.fi, "bts%d-trx%d", bts->nr, trx->nr); gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC, - bts->nr, trx->nr, 0xff); + bts->bts_nr, trx->nr, 0xff);
for (k = 0; k < TRX_NR_TS; k++) { struct gsm_bts_trx_ts *ts = &trx->ts[k]; @@ -100,7 +100,7 @@ osmo_fsm_inst_update_id_f(ts->mo.fi, "bts%d-trx%d-ts%d", bts->nr, trx->nr, ts->nr); gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL, - bts->nr, trx->nr, ts->nr); + bts->bts_nr, trx->nr, ts->nr);
ts->hopping.arfcns.data_len = sizeof(ts->hopping.arfcns_data); ts->hopping.arfcns.data = ts->hopping.arfcns_data;
-
pespin