[S] Change in osmo-bsc[master]: abis_nm: fix bts->nr vs bts->bts_nr

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34443?usp=email ) Change subject: abis_nm: fix bts->nr vs bts->bts_nr ...................................................................... abis_nm: fix bts->nr vs bts->bts_nr Using bts->nr on the wire is wrong because: * bts->nr is a BTS number in the BSC's config file, * bts->bts_nr is a BTS number within the SITE-MANAGER MO. The problem does not show up if there exists only one BTS node in osmo-bsc.cfg. Otherwise, the Software Load and BTS Restart procedures are broken for nanoBTS. Change-Id: I99d9c72752e55c4553e2e9c60df5caa8343b7be0 --- M src/osmo-bsc/abis_nm.c 1 file changed, 20 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 90b28eb..81a0272 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -1693,7 +1693,7 @@ break; case GSM_BTS_TYPE_NANOBTS: sw->obj_class = NM_OC_BASEB_TRANSC; - sw->obj_instance[0] = sw->bts->nr; + sw->obj_instance[0] = sw->bts->bts_nr; sw->obj_instance[1] = sw->trx_nr; sw->obj_instance[2] = 0xff; break; @@ -3102,7 +3102,7 @@ oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, 0, NM_MT_IPACC_RESTART, NM_OC_BASEB_TRANSC, - trx->bts->nr, trx->nr, 0xff); + trx->bts->bts_nr, trx->nr, 0xff); return abis_nm_sendmsg_direct(trx->bts, msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34443?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I99d9c72752e55c4553e2e9c60df5caa8343b7be0 Gerrit-Change-Number: 34443 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged