diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2023-09-16 22:42:39 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2023-09-16 22:56:40 +0700 |
| commit | fc2fb0d1a49c6ba2b9ca75d7c01885fa5228979b (patch) | |
| tree | b2737eed2cd71a168f538827b5212000eaeb62f1 /src | |
| parent | bf7b457f1cab6f0683c2650798e8ab24af634cdc (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/osmo-bsc/abis_nm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 90b28eb50..81a027247 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -1693,7 +1693,7 @@ int abis_nm_software_load(struct gsm_bts *bts, int trx_nr, const char *fname, 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 @@ int abis_nm_ipaccess_restart(struct gsm_bts_trx *trx) 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); } |