jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34624?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Select correct neighbor list for measurement report decoding ...................................................................... Select correct neighbor list for measurement report decoding System Information 2 (bis/ter) uses BA_IND of 0. This refers to "neigh_list". System information 5 (bis/ter) uses BA_IND of 1. This may refer to "neigh_list" or optionally "si5_neigh_list", depending on the VTY settings. If BA_IND of 1 is received in measurement report and if the optional "si5_neigh_list" is used, this list is chosen to decode the measurement report. Change-Id: Ie9123928fb3ae6f10921ecf01d1b50330661da38 --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 26 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 67896b1..2c9f7e9 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -902,7 +902,7 @@ struct gsm48_hdr *gh = msgb_l3(msg); uint8_t *data = gh->data; struct gsm_bts *bts = msg->lchan->ts->trx->bts; - struct bitvec *nbv = &bts->si_common.neigh_list; + struct bitvec *nbv; struct gsm_meas_rep_cell *mrc; if (gh->msg_type != GSM48_MT_RR_MEAS_REP) @@ -927,6 +927,13 @@ return 0; } + /* If the phone reports BA-IND 1 this is a report for the SI5* set. + * If we have generated SI5* with manual SI5 neighbor list, the measurements refer to it. */ + if ((rep->flags & MEAS_REP_F_BA1) && bts->neigh_list_manual_mode == NL_MODE_MANUAL_SI5SEP) + nbv = &bts->si_common.si5_neigh_list; + else + nbv = &bts->si_common.neigh_list; + /* an encoding nightmare in perfection */ mrc = &rep->cell[0]; mrc->rxlev = data[3] & 0x3f; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34624?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: Ie9123928fb3ae6f10921ecf01d1b50330661da38 Gerrit-Change-Number: 34624 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas@eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: jolly <andreas@eversberg.eu> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged