December 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: remsim: bankd: Install vsmartcard-vpcd

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39135?usp=email ) Change subject: remsim: bankd: Install vsmartcard-vpcd ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39135?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib5ba5075eff4955354fa25d1c605f277e8a6962a Gerrit-Change-Number: 39135 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Dec 2024 14:21:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: remsim: bankd: Install vsmartcard-vpcd

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39135?usp=email ) Change subject: remsim: bankd: Install vsmartcard-vpcd ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > Well done! Yeah it's better to do this once in _testenv/data/podman/Dockerfile. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39135?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib5ba5075eff4955354fa25d1c605f277e8a6962a Gerrit-Change-Number: 39135 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Dec 2024 14:21:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[XS] Change in osmo-bsc[master]: Fix BTS nr >255 wrapping up during bts allocation

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39138?usp=email ) Change subject: Fix BTS nr >255 wrapping up during bts allocation ...................................................................... Fix BTS nr >255 wrapping up during bts allocation Commit which introduced the gsm_bts_nr_t type forgot to use it in these functions. As a result, bts 256 ended up trying to allocate rate counters for id=0. Change-Id: I5128becaf453f5cfbc722a55c756432e525fc884 Fixes: 6fe0e28a23a3aa3e707d147569add7f68d5dc4a1 Related: SYS#7063 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/bts_sm.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_sm.c 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 251c161..248c746 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -805,7 +805,7 @@ return &lai; } -struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, uint8_t bts_num); +struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, gsm_bts_nr_t bts_num); int gsm_bts_check_cfg(struct gsm_bts *bts); char *gsm_bts_name(const struct gsm_bts *bts); diff --git a/include/osmocom/bsc/bts_sm.h b/include/osmocom/bsc/bts_sm.h index 13be3d9..8fbdd74 100644 --- a/include/osmocom/bsc/bts_sm.h +++ b/include/osmocom/bsc/bts_sm.h @@ -68,7 +68,7 @@ return site_mgr->bts[0]; } -struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, uint8_t bts_num); +struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, gsm_bts_nr_t bts_num); void gsm_bts_sm_mo_reset(struct gsm_bts_sm *bts_sm); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index c21e5b3..9febe35 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -193,7 +193,7 @@ * This part is shared among the thin programs in osmo-bsc/src/utils/. * osmo-bsc requires further initialization that pulls in more dependencies (see * bsc_bts_alloc_register()). */ -struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, uint8_t bts_num) +struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, gsm_bts_nr_t bts_num) { struct gsm_bts *bts = talloc_zero(bts_sm, struct gsm_bts); diff --git a/src/osmo-bsc/bts_sm.c b/src/osmo-bsc/bts_sm.c index ca572f1..d122369 100644 --- a/src/osmo-bsc/bts_sm.c +++ b/src/osmo-bsc/bts_sm.c @@ -49,7 +49,7 @@ return 0; } -struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, uint8_t bts_num) +struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, gsm_bts_nr_t bts_num) { struct gsm_bts_sm *bts_sm = talloc_zero(net, struct gsm_bts_sm); struct gsm_bts *bts; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39138?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5128becaf453f5cfbc722a55c756432e525fc884 Gerrit-Change-Number: 39138 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: Use correct bts_nr field during MO init

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39139?usp=email ) Change subject: Use correct bts_nr field during MO init ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39139?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8a70c61cef74c0febeefae88dee575fbb4936d3e Gerrit-Change-Number: 39139 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Dec 2024 14:21:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: remsim: bankd: Install vsmartcard-vpcd

by osmith

Attention is currently required from: laforge, pespin. osmith has uploaded a new patch set (#2) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39135?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: remsim: bankd: Install vsmartcard-vpcd ...................................................................... remsim: bankd: Install vsmartcard-vpcd This is needed for test RemsimBankd_Tests.TC_createMapping_exchangeTPDU to work. Co-authored-by: Oliver Smith <osmith(a)sysmocom.de> Change-Id: Ib5ba5075eff4955354fa25d1c605f277e8a6962a --- M _testenv/data/podman/Dockerfile A _testenv/data/scripts/require_vsmartcard_vpcd.sh M remsim/testenv_bankd.cfg 3 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/39135/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39135?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib5ba5075eff4955354fa25d1c605f277e8a6962a Gerrit-Change-Number: 39135 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[XS] Change in osmo-bsc[master]: Fix BTS nr >255 wrapping up during bts allocation

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39138?usp=email ) Change subject: Fix BTS nr >255 wrapping up during bts allocation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39138?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5128becaf453f5cfbc722a55c756432e525fc884 Gerrit-Change-Number: 39138 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Dec 2024 14:20:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[XS] Change in libosmocore[master]: osmo_io: Log current queue length upon enqueue failure

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/39140?usp=email ) Change subject: osmo_io: Log current queue length upon enqueue failure ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39140?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia712af2041241ea6aa0e03818908fd295d157fd2 Gerrit-Change-Number: 39140 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Dec 2024 13:43:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[XS] Change in libosmocore[master]: osmo_io: Log current queue length upon enqueue failure

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/39140?usp=email ) Change subject: osmo_io: Log current queue length upon enqueue failure ...................................................................... osmo_io: Log current queue length upon enqueue failure Change-Id: Ia712af2041241ea6aa0e03818908fd295d157fd2 --- M src/core/osmo_io.c 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/39140/1 diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index d1767d2..e109cdf 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -209,8 +209,11 @@ */ int iofd_txqueue_enqueue(struct osmo_io_fd *iofd, struct iofd_msghdr *msghdr) { - if (iofd->tx_queue.current_length >= iofd->tx_queue.max_length) + if (iofd->tx_queue.current_length >= iofd->tx_queue.max_length) { + LOGPIO(iofd, LOGL_ERROR, "enqueueing message failed (queue full, %u msgs). Rejecting msgb\n", + iofd->tx_queue.current_length); return -ENOSPC; + } llist_add_tail(&msghdr->list, &iofd->tx_queue.msg_queue); iofd->tx_queue.current_length++; @@ -520,7 +523,6 @@ rc = iofd_txqueue_enqueue(iofd, msghdr); if (rc < 0) { iofd_msghdr_free(msghdr); - LOGPIO(iofd, LOGL_ERROR, "enqueueing message failed (%d). Rejecting msgb\n", rc); return rc; } @@ -596,7 +598,6 @@ rc = iofd_txqueue_enqueue(iofd, msghdr); if (rc < 0) { iofd_msghdr_free(msghdr); - LOGPIO(iofd, LOGL_ERROR, "enqueueing message failed (%d). Rejecting msgb\n", rc); return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39140?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia712af2041241ea6aa0e03818908fd295d157fd2 Gerrit-Change-Number: 39140 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[XS] Change in osmo-bsc[master]: Fix BTS nr >255 wrapping up during bts allocation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39138?usp=email ) Change subject: Fix BTS nr >255 wrapping up during bts allocation ...................................................................... Fix BTS nr >255 wrapping up during bts allocation Commit which introduced the gsm_bts_nr_t type forgot to use it in these functions. As a result, bts 256 ended up trying to allocate rate counters for id=0. Change-Id: I5128becaf453f5cfbc722a55c756432e525fc884 Fixes: 6fe0e28a23a3aa3e707d147569add7f68d5dc4a1 Related: SYS#7063 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/bts_sm.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_sm.c 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/39138/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 251c161..248c746 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -805,7 +805,7 @@ return &lai; } -struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, uint8_t bts_num); +struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, gsm_bts_nr_t bts_num); int gsm_bts_check_cfg(struct gsm_bts *bts); char *gsm_bts_name(const struct gsm_bts *bts); diff --git a/include/osmocom/bsc/bts_sm.h b/include/osmocom/bsc/bts_sm.h index 13be3d9..8fbdd74 100644 --- a/include/osmocom/bsc/bts_sm.h +++ b/include/osmocom/bsc/bts_sm.h @@ -68,7 +68,7 @@ return site_mgr->bts[0]; } -struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, uint8_t bts_num); +struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, gsm_bts_nr_t bts_num); void gsm_bts_sm_mo_reset(struct gsm_bts_sm *bts_sm); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index c21e5b3..9febe35 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -193,7 +193,7 @@ * This part is shared among the thin programs in osmo-bsc/src/utils/. * osmo-bsc requires further initialization that pulls in more dependencies (see * bsc_bts_alloc_register()). */ -struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, uint8_t bts_num) +struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, gsm_bts_nr_t bts_num) { struct gsm_bts *bts = talloc_zero(bts_sm, struct gsm_bts); diff --git a/src/osmo-bsc/bts_sm.c b/src/osmo-bsc/bts_sm.c index ca572f1..d122369 100644 --- a/src/osmo-bsc/bts_sm.c +++ b/src/osmo-bsc/bts_sm.c @@ -49,7 +49,7 @@ return 0; } -struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, uint8_t bts_num) +struct gsm_bts_sm *gsm_bts_sm_alloc(struct gsm_network *net, gsm_bts_nr_t bts_num) { struct gsm_bts_sm *bts_sm = talloc_zero(net, struct gsm_bts_sm); struct gsm_bts *bts; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39138?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5128becaf453f5cfbc722a55c756432e525fc884 Gerrit-Change-Number: 39138 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: Use correct bts_nr field during MO init

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/39/39139/1 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; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39139?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8a70c61cef74c0febeefae88dee575fbb4936d3e Gerrit-Change-Number: 39139 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024