fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/32539 )
Change subject: bootstrap_rsl(): cosmetic: cache trx->bts and use it directly
......................................................................
bootstrap_rsl(): cosmetic: cache trx->bts and use it directly
Change-Id: I736ebf185028976dad5ff6f61386b6d2eeab8fbd
Related: SYS#6435
---
M src/osmo-bsc/osmo_bsc_main.c
1 file changed, 17 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
laforge: Looks good to me, approved
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 50cc0e0..133e5c2 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -312,16 +312,16 @@
static void bootstrap_rsl(struct gsm_bts_trx *trx)
{
+ struct gsm_bts *bts = trx->bts;
unsigned int i;
int rc;
LOG_TRX(trx, DRSL, LOGL_NOTICE, "bootstrapping RSL "
"on ARFCN %u using MCC-MNC %s LAC=%u CID=%u BSIC=%u\n",
trx->arfcn, osmo_plmn_name(&bsc_gsmnet->plmn),
- trx->bts->location_area_code,
- trx->bts->cell_identity, trx->bts->bsic);
+ bts->location_area_code, bts->cell_identity, bts->bsic);
- if (trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) {
+ if (bts->type == GSM_BTS_TYPE_NOKIA_SITE) {
rsl_nokia_si_begin(trx);
}
@@ -338,14 +338,14 @@
return;
}
- if (trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) {
+ if (bts->type == GSM_BTS_TYPE_NOKIA_SITE) {
/* channel unspecific, power reduction in 2 dB steps */
rsl_bs_power_control(trx, 0xFF, trx->max_power_red / 2);
rsl_nokia_si_end(trx);
}
- if (trx->bts->model->power_ctrl_send_def_params != NULL) {
- rc = trx->bts->model->power_ctrl_send_def_params(trx);
+ if (bts->model->power_ctrl_send_def_params != NULL) {
+ rc = bts->model->power_ctrl_send_def_params(trx);
if (rc) {
LOG_TRX(trx, DRSL, LOGL_ERROR, "Failed to send default "
"MS/BS Power control parameters (rc=%d)\n", rc);
@@ -360,7 +360,7 @@
}
/* Drop all expired channel requests in the list */
- abis_rsl_chan_rqd_queue_flush(trx->bts);
+ abis_rsl_chan_rqd_queue_flush(bts);
}
struct osmo_timer_list update_connection_stats_timer;
--
To view, visit
https://gerrit.osmocom.org/c/osmo-bsc/+/32539
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I736ebf185028976dad5ff6f61386b6d2eeab8fbd
Gerrit-Change-Number: 32539
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged