Change in osmo-bts[master]: bts: Fix TRX0 param initialization

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Wed Nov 21 19:07:29 UTC 2018


Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11864


Change subject: bts: Fix TRX0 param initialization
......................................................................

bts: Fix TRX0 param initialization

TRX0 is allocated in a different place than other TRX.

Commit that introduced the bug added an initialization step
(bts_trx_init) applied in VTY cmd "trx <0-254>", where TRX are allocated
since same commit, but doesn't initialize TRX0 for reasons explained in
first paragraph.

As a result, some parameters were not applied to TRX0, like
power ramping increment step, which prevented MS from finding the network in
osmo-gsm-tester tests.

Fixes: eebb6a4216f136132400831ca35ed70e7502e92a ("bts: Allocate TRX for BTS dynamically, deprecate -t")
Change-Id: I5afd66548634ff53e2af24dc7055d408ca8ca4e3
---
M src/common/bts.c
M src/common/gsm_data_shared.c
M src/common/vty.c
3 files changed, 7 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/11864/1

diff --git a/src/common/bts.c b/src/common/bts.c
index 2b17ec6..abbaeb4 100644
--- a/src/common/bts.c
+++ b/src/common/bts.c
@@ -177,6 +177,8 @@
 		return rc;
 	}
 
+	/* TRX0 was allocated early during gsm_bts_alloc, not later through VTY */
+	bts_trx_init(bts->c0);
 	bts_gsmnet.num_bts++;
 
 	if (!initialized) {
diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c
index 21e5781..beb3107 100644
--- a/src/common/gsm_data_shared.c
+++ b/src/common/gsm_data_shared.c
@@ -333,7 +333,7 @@
 	memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default,
 		sizeof(bts->gprs.cell.rlc_cfg));
 
-	/* create our primary TRX */
+	/* create our primary TRX. It will be initialized during bts_init() */
 	bts->c0 = gsm_bts_trx_alloc(bts);
 	if (!bts->c0) {
 		talloc_free(bts);
diff --git a/src/common/vty.c b/src/common/vty.c
index f305413..7c2900f 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -233,7 +233,10 @@
 			bts->num_trx, VTY_NEWLINE);
 		return CMD_WARNING;
 	} else if (trx_nr == bts->num_trx) {
-		/* allocate a new one */
+		/* Allocate a new TRX
+		 * Remark: TRX0 was already created during gsm_bts_alloc() and
+		 * 	   initialized in bts_init(), not here.
+		 */
 		trx = gsm_bts_trx_alloc(bts);
 		if (trx)
 			bts_trx_init(trx);

-- 
To view, visit https://gerrit.osmocom.org/11864
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5afd66548634ff53e2af24dc7055d408ca8ca4e3
Gerrit-Change-Number: 11864
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181121/09a798ae/attachment.html>


More information about the gerrit-log mailing list