Change in osmo-bsc[master]: Revert "update neighbor ARFCNs on startup and config changes"

pespin gerrit-no-reply at lists.osmocom.org
Fri Apr 23 12:07:47 UTC 2021


pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23875 )

Change subject: Revert "update neighbor ARFCNs on startup and config changes"
......................................................................

Revert "update neighbor ARFCNs on startup and config changes"

This patch caused major breakage in my setup, with BSC printing at
startup: "(bts=0,trx=0) Failed to generate System Information".

And bts-trx printing all the time:
"sysinfo.c:162 PH-RTS-IND: Unable to determine actual BS_AG_BLKS_RES
value as SI3 is not available yet, fallback to 1"

This reverts commit c1a5310a3ed75ff24dc2d6a48c09d8dfc89d944c.

Change-Id: I5da365c93aedc6668a77b82ee9b68cbec64967e3
---
M include/osmocom/bsc/bts.h
M src/osmo-bsc/bsc_init.c
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/bts.c
M src/osmo-bsc/bts_trx.c
M src/osmo-bsc/neighbor_ident_vty.c
M src/osmo-bsc/osmo_bsc_main.c
7 files changed, 3 insertions(+), 48 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved



diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h
index 58ca104..bcc215d 100644
--- a/include/osmocom/bsc/bts.h
+++ b/include/osmocom/bsc/bts.h
@@ -671,7 +671,6 @@
 int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan);
 
 int gsm_bts_set_system_infos(struct gsm_bts *bts);
-int gsm_net_set_system_infos(void);
 
 int gsm_bts_model_register(struct gsm_bts_model *model);
 struct gsm_bts_model *bts_model_find(enum gsm_bts_type type);
diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c
index cd97695..b572f27 100644
--- a/src/osmo-bsc/bsc_init.c
+++ b/src/osmo-bsc/bsc_init.c
@@ -168,15 +168,3 @@
 
 	return bts;
 }
-
-int gsm_net_set_system_infos(void)
-{
-	struct gsm_bts *bts;
-	int ret = 0;
-	llist_for_each_entry(bts, &bsc_gsmnet->bts_list, list) {
-		int rc = gsm_bts_set_system_infos(bts);
-		if (rc)
-			ret = rc;
-	}
-	return ret;
-}
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 1a6cf0a..3c60f5f 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -2448,11 +2448,6 @@
 	}
 	bts->cell_identity = ci;
 
-	/* Changing the CI of a BTS may affect the neighbor relations between cells, when other cells indicate a
-	 * neighbor cell by CI. Update the neighbors list in System Information. */
-	if (vty->type != VTY_FILE)
-		gsm_net_set_system_infos();
-
 	return CMD_SUCCESS;
 }
 
@@ -2479,11 +2474,6 @@
 
 	bts->location_area_code = lac;
 
-	/* Changing the LAC of a BTS may affect the neighbor relations between cells, when other cells indicate a
-	 * neighbor cell by LAC. Update the neighbors list in System Information. */
-	if (vty->type != VTY_FILE)
-		gsm_net_set_system_infos();
-
 	return CMD_SUCCESS;
 }
 
@@ -2514,9 +2504,6 @@
 	}
 	bts->bsic = bsic;
 
-	if (vty->type != VTY_FILE)
-		gsm_net_set_system_infos();
-
 	return CMD_SUCCESS;
 }
 
@@ -5360,9 +5347,7 @@
 		return CMD_WARNING;
 	}
 
-	if (vty->type != VTY_FILE)
-		gsm_net_set_system_infos();
-
+	/* FIXME: patch ARFCN into SYSTEM INFORMATION */
 	/* FIXME: use OML layer to update the ARFCN */
 	/* FIXME: use RSL layer to update SYSTEM INFORMATION */
 
diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c
index 08587d7..2192c56 100644
--- a/src/osmo-bsc/bts.c
+++ b/src/osmo-bsc/bts.c
@@ -722,7 +722,6 @@
 int gsm_bts_set_system_infos(struct gsm_bts *bts)
 {
 	struct gsm_bts_trx *trx;
-	int ret = 0;
 
 	/* Generate a new ID */
 	bts->bcch_change_mark += 1;
@@ -733,10 +732,10 @@
 
 		rc = gsm_bts_trx_set_system_infos(trx);
 		if (rc != 0)
-			ret = rc;
+			return rc;
 	}
 
-	return ret;
+	return 0;
 }
 
 const struct rate_ctr_desc bts_ctr_description[] = {
diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c
index d67c9a1..6d98929 100644
--- a/src/osmo-bsc/bts_trx.c
+++ b/src/osmo-bsc/bts_trx.c
@@ -429,10 +429,6 @@
 
 	/* Third, we send the selected SI via RSL */
 
-	/* If the BTS is not up and running yet, don't send anything. */
-	if (!trx_is_usable(trx))
-		return -1;
-
 	for (n = 0; n < n_si; n++) {
 		i = gen_si[n];
 		/* 3GPP TS 08.58 §8.5.1 BCCH INFORMATION. If we don't currently
diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c
index 12aca9d..b9160ec 100644
--- a/src/osmo-bsc/neighbor_ident_vty.c
+++ b/src/osmo-bsc/neighbor_ident_vty.c
@@ -183,10 +183,6 @@
 	neighbor = talloc_zero(bts, struct neighbor);
 	*neighbor = *n;
 	llist_add_tail(&neighbor->entry, &bts->neighbors);
-
-	if (vty->type != VTY_FILE)
-		gsm_bts_set_system_infos(bts);
-
 	return CMD_SUCCESS;
 }
 
@@ -217,10 +213,6 @@
 
 		llist_del(&neighbor->entry);
 		talloc_free(neighbor);
-
-		if (vty->type != VTY_FILE)
-			gsm_bts_set_system_infos(bts);
-
 		return CMD_SUCCESS;
 	}
 
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index fd41b74..3069cc0 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -942,10 +942,6 @@
 		exit(1);
 	}
 
-	/* Make the 'show bts' information list the neighbor ARFCNs by updating the
-	 * system_information.si_common.neigh_list. */
-	gsm_net_set_system_infos();
-
 	/* start control interface after reading config for
 	 * ctrl_vty_get_bind_addr() */
 	bsc_gsmnet->ctrl = bsc_controlif_setup(bsc_gsmnet,

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23875
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I5da365c93aedc6668a77b82ee9b68cbec64967e3
Gerrit-Change-Number: 23875
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Assignee: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-CC: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210423/3e125794/attachment.htm>


More information about the gerrit-log mailing list