[MERGED] osmo-bsc[master]: fix initialization of acc ramping
Harald Welte has submitted this change and it was merged. Change subject: fix initialization of acc ramping .. fix initialization of acc ramping Remove a redundant call to acc_ramp_init() during bootstrap_bts(). ACC ramping state is already initialized during VTY config parsing, and bootstrap_bts() accidentally disabled ACC ramping again even if it was enabled in the configuration. This bug was introduced in last-minute refactoring during review of https://gerrit.osmocom.org/#/c/6324/ when the acc_ramping_enabled flag was moved from struct gsm_bts to the acc_ramp structure itself. Also remove an acc_ramp_init() call in bootstrap_rsl(). It is no longer needed as it serves no purpose other than initializing the bitmasks of barred ACCs. To ensure that ACC ramping configuration provided to the BTS via system information stays correct, we move the call to acc_ramp_start(), which has the same effect on barred ACCs, further up. Change-Id: Ib7d99c9d3d5d424e21bb7710f719c42f9aef3e95 Fixes: 6442e4327b1100ecfed7a242e397ac37b7529bea Related: OS#2591 --- M src/libbsc/bsc_init.c 1 file changed, 4 insertions(+), 10 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index ba8b8e6..d1173e0 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -332,16 +332,13 @@ trx->bts->location_area_code, trx->bts->cell_identity, trx->bts->bsic); - /* -* Re-initialize ACC ramping to ensure ACCs are barred/allowed -* according to our current VTY configuration. -*/ - acc_ramp_init(&trx->bts->acc_ramp, acc_ramp_is_enabled(&trx->bts->acc_ramp), trx->bts); - if (trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) { rsl_nokia_si_begin(trx); } + /* Configure ACC ramping before sending system information to BTS. */ + if (acc_ramp_is_enabled(&trx->bts->acc_ramp)) + acc_ramp_start(&trx->bts->acc_ramp); gsm_bts_trx_set_system_infos(trx); if (trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) { @@ -354,9 +351,6 @@ generate_ma_for_ts(&trx->ts[i]); dyn_ts_init(&trx->ts[i]); } - - if (acc_ramp_is_enabled(&trx->bts->acc_ramp)) - acc_ramp_start(&trx->bts->acc_ramp); } /* Callback function to be called every time we receive a signal from INPUT */ @@ -539,7 +533,7 @@ bts->chan_load_samples_idx = 0; - acc_ramp_init(&bts->acc_ramp, false, bts); + /* ACC ramping is initialized from vty/config */ /* Initialize the BTS state */ gsm_bts_mo_reset(bts); -- To view, visit https://gerrit.osmocom.org/7691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib7d99c9d3d5d424e21bb7710f719c42f9aef3e95 Gerrit-PatchSet: 4 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol
osmo-bsc[master]: fix initialization of acc ramping
Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib7d99c9d3d5d424e21bb7710f719c42f9aef3e95 Gerrit-PatchSet: 3 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
osmo-bsc[master]: fix initialization of acc ramping
Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/7691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib7d99c9d3d5d424e21bb7710f719c42f9aef3e95 Gerrit-PatchSet: 3 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
[PATCH] osmo-bsc[master]: fix initialization of acc ramping
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7691 to look at the new patch set (#3). fix initialization of acc ramping Remove a redundant call to acc_ramp_init() during bootstrap_bts(). ACC ramping state is already initialized during VTY config parsing, and bootstrap_bts() accidentally disabled ACC ramping again even if it was enabled in the configuration. This bug was introduced in last-minute refactoring during review of https://gerrit.osmocom.org/#/c/6324/ when the acc_ramping_enabled flag was moved from struct gsm_bts to the acc_ramp structure itself. Also remove an acc_ramp_init() call in bootstrap_rsl(). It is no longer needed as it serves no purpose other than initializing the bitmasks of barred ACCs. To ensure that ACC ramping configuration provided to the BTS via system information stays correct, we move the call to acc_ramp_start(), which has the same effect on barred ACCs, further up. Change-Id: Ib7d99c9d3d5d424e21bb7710f719c42f9aef3e95 Fixes: 6442e4327b1100ecfed7a242e397ac37b7529bea Related: OS#2591 --- M src/libbsc/bsc_init.c 1 file changed, 4 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/7691/3 diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index ba8b8e6..d1173e0 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -332,16 +332,13 @@ trx->bts->location_area_code, trx->bts->cell_identity, trx->bts->bsic); - /* -* Re-initialize ACC ramping to ensure ACCs are barred/allowed -* according to our current VTY configuration. -*/ - acc_ramp_init(&trx->bts->acc_ramp, acc_ramp_is_enabled(&trx->bts->acc_ramp), trx->bts); - if (trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) { rsl_nokia_si_begin(trx); } + /* Configure ACC ramping before sending system information to BTS. */ + if (acc_ramp_is_enabled(&trx->bts->acc_ramp)) + acc_ramp_start(&trx->bts->acc_ramp); gsm_bts_trx_set_system_infos(trx); if (trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) { @@ -354,9 +351,6 @@ generate_ma_for_ts(&trx->ts[i]); dyn_ts_init(&trx->ts[i]); } - - if (acc_ramp_is_enabled(&trx->bts->acc_ramp)) - acc_ramp_start(&trx->bts->acc_ramp); } /* Callback function to be called every time we receive a signal from INPUT */ @@ -539,7 +533,7 @@ bts->chan_load_samples_idx = 0; - acc_ramp_init(&bts->acc_ramp, false, bts); + /* ACC ramping is initialized from vty/config */ /* Initialize the BTS state */ gsm_bts_mo_reset(bts); -- To view, visit https://gerrit.osmocom.org/7691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib7d99c9d3d5d424e21bb7710f719c42f9aef3e95 Gerrit-PatchSet: 3 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-bsc[master]: fix initialization of acc ramping
fix initialization of acc ramping Remove a redundant call to acc_ramp_init() during bootstrap_bts(). ACC ramping state is already initialized during VTY config parsing, and bootstrap_bts() accidentally disabled ACC ramping again even if it was enabled in the configuration. This bug was introduced in last-minute refactoring during review of https://gerrit.osmocom.org/#/c/6324/ when the acc_ramping_enabled flag was moved from struct gsm_bts to the acc_ramp structure itself. Change-Id: Ib7d99c9d3d5d424e21bb7710f719c42f9aef3e95 Fixes: 6442e4327b1100ecfed7a242e397ac37b7529bea Related: OS#2591 --- M src/libbsc/bsc_init.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/7691/2 diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index ba8b8e6..366b01f 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -539,7 +539,7 @@ bts->chan_load_samples_idx = 0; - acc_ramp_init(&bts->acc_ramp, false, bts); + /* ACC ramping is initialized from vty/config */ /* Initialize the BTS state */ gsm_bts_mo_reset(bts); -- To view, visit https://gerrit.osmocom.org/7691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib7d99c9d3d5d424e21bb7710f719c42f9aef3e95 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-bsc[master]: fix initialization of acc ramping
Review at https://gerrit.osmocom.org/7691 fix initialization of acc ramping Remove a redundant call to acc_ramp_init() during bootstrap_bts(). ACC ramping state is already initialized during VTY config parsing, and bootstrap_bts() accidentally disabled ACC ramping again even if it was enabled in the configuration. This bug was introduced in last-minute refactoring during review of https://gerrit.osmocom.org/#/c/6324/ when the acc_ramping_enabled flag was moved from struct gsm_bts to the acc_ramp structure itself. Change-Id: Ib7d99c9d3d5d424e21bb7710f719c42f9aef3e95 Related: OS#2591 --- M src/libbsc/bsc_init.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/7691/1 diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index ba8b8e6..366b01f 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -539,7 +539,7 @@ bts->chan_load_samples_idx = 0; - acc_ramp_init(&bts->acc_ramp, false, bts); + /* ACC ramping is initialized from vty/config */ /* Initialize the BTS state */ gsm_bts_mo_reset(bts); -- To view, visit https://gerrit.osmocom.org/7691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7d99c9d3d5d424e21bb7710f719c42f9aef3e95 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Stefan Sperling