<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23875">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "update neighbor ARFCNs on startup and config changes"<br><br>This patch caused major breakage in my setup, with BSC printing at<br>startup: "(bts=0,trx=0) Failed to generate System Information".<br><br>And bts-trx printing all the time:<br>"sysinfo.c:162 PH-RTS-IND: Unable to determine actual BS_AG_BLKS_RES<br>value as SI3 is not available yet, fallback to 1"<br><br>This reverts commit c1a5310a3ed75ff24dc2d6a48c09d8dfc89d944c.<br><br>Change-Id: I5da365c93aedc6668a77b82ee9b68cbec64967e3<br>---<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/bsc_init.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/bts_trx.c<br>M src/osmo-bsc/neighbor_ident_vty.c<br>M src/osmo-bsc/osmo_bsc_main.c<br>7 files changed, 3 insertions(+), 48 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/23875/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index 58ca104..bcc215d 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -671,7 +671,6 @@</span><br><span> int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan);</span><br><span> </span><br><span> int gsm_bts_set_system_infos(struct gsm_bts *bts);</span><br><span style="color: hsl(0, 100%, 40%);">-int gsm_net_set_system_infos(void);</span><br><span> </span><br><span> int gsm_bts_model_register(struct gsm_bts_model *model);</span><br><span> struct gsm_bts_model *bts_model_find(enum gsm_bts_type type);</span><br><span>diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c</span><br><span>index cd97695..b572f27 100644</span><br><span>--- a/src/osmo-bsc/bsc_init.c</span><br><span>+++ b/src/osmo-bsc/bsc_init.c</span><br><span>@@ -168,15 +168,3 @@</span><br><span> </span><br><span>         return bts;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int gsm_net_set_system_infos(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-     struct gsm_bts *bts;</span><br><span style="color: hsl(0, 100%, 40%);">-    int ret = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-    llist_for_each_entry(bts, &bsc_gsmnet->bts_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-         int rc = gsm_bts_set_system_infos(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-         if (rc)</span><br><span style="color: hsl(0, 100%, 40%);">-                 ret = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span style="color: hsl(0, 100%, 40%);">-       return ret;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 1a6cf0a..3c60f5f 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -2448,11 +2448,6 @@</span><br><span>   }</span><br><span>    bts->cell_identity = ci;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Changing the CI of a BTS may affect the neighbor relations between cells, when other cells indicate a</span><br><span style="color: hsl(0, 100%, 40%);">-         * neighbor cell by CI. Update the neighbors list in System Information. */</span><br><span style="color: hsl(0, 100%, 40%);">-     if (vty->type != VTY_FILE)</span><br><span style="color: hsl(0, 100%, 40%);">-           gsm_net_set_system_infos();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>  return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -2479,11 +2474,6 @@</span><br><span> </span><br><span>    bts->location_area_code = lac;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* Changing the LAC of a BTS may affect the neighbor relations between cells, when other cells indicate a</span><br><span style="color: hsl(0, 100%, 40%);">-        * neighbor cell by LAC. Update the neighbors list in System Information. */</span><br><span style="color: hsl(0, 100%, 40%);">-    if (vty->type != VTY_FILE)</span><br><span style="color: hsl(0, 100%, 40%);">-           gsm_net_set_system_infos();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>  return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -2514,9 +2504,6 @@</span><br><span>         }</span><br><span>    bts->bsic = bsic;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        if (vty->type != VTY_FILE)</span><br><span style="color: hsl(0, 100%, 40%);">-           gsm_net_set_system_infos();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>  return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -5360,9 +5347,7 @@</span><br><span>                 return CMD_WARNING;</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (vty->type != VTY_FILE)</span><br><span style="color: hsl(0, 100%, 40%);">-           gsm_net_set_system_infos();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+   /* FIXME: patch ARFCN into SYSTEM INFORMATION */</span><br><span>     /* FIXME: use OML layer to update the ARFCN */</span><br><span>       /* FIXME: use RSL layer to update SYSTEM INFORMATION */</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 08587d7..2192c56 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -722,7 +722,6 @@</span><br><span> int gsm_bts_set_system_infos(struct gsm_bts *bts)</span><br><span> {</span><br><span>     struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">-        int ret = 0;</span><br><span> </span><br><span>     /* Generate a new ID */</span><br><span>      bts->bcch_change_mark += 1;</span><br><span>@@ -733,10 +732,10 @@</span><br><span> </span><br><span>           rc = gsm_bts_trx_set_system_infos(trx);</span><br><span>              if (rc != 0)</span><br><span style="color: hsl(0, 100%, 40%);">-                    ret = rc;</span><br><span style="color: hsl(120, 100%, 40%);">+                     return rc;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+   return 0;</span><br><span> }</span><br><span> </span><br><span> const struct rate_ctr_desc bts_ctr_description[] = {</span><br><span>diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c</span><br><span>index d67c9a1..6d98929 100644</span><br><span>--- a/src/osmo-bsc/bts_trx.c</span><br><span>+++ b/src/osmo-bsc/bts_trx.c</span><br><span>@@ -429,10 +429,6 @@</span><br><span> </span><br><span>   /* Third, we send the selected SI via RSL */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        /* If the BTS is not up and running yet, don't send anything. */</span><br><span style="color: hsl(0, 100%, 40%);">-    if (!trx_is_usable(trx))</span><br><span style="color: hsl(0, 100%, 40%);">-                return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   for (n = 0; n < n_si; n++) {</span><br><span>              i = gen_si[n];</span><br><span>               /* 3GPP TS 08.58 ยง8.5.1 BCCH INFORMATION. If we don't currently</span><br><span>diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>index 12aca9d..b9160ec 100644</span><br><span>--- a/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>+++ b/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>@@ -183,10 +183,6 @@</span><br><span>         neighbor = talloc_zero(bts, struct neighbor);</span><br><span>        *neighbor = *n;</span><br><span>      llist_add_tail(&neighbor->entry, &bts->neighbors);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-        if (vty->type != VTY_FILE)</span><br><span style="color: hsl(0, 100%, 40%);">-           gsm_bts_set_system_infos(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>       return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -217,10 +213,6 @@</span><br><span> </span><br><span>              llist_del(&neighbor->entry);</span><br><span>          talloc_free(neighbor);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-          if (vty->type != VTY_FILE)</span><br><span style="color: hsl(0, 100%, 40%);">-                   gsm_bts_set_system_infos(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>               return CMD_SUCCESS;</span><br><span>  }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index fd41b74..3069cc0 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -942,10 +942,6 @@</span><br><span>            exit(1);</span><br><span>     }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* Make the 'show bts' information list the neighbor ARFCNs by updating the</span><br><span style="color: hsl(0, 100%, 40%);">-      * system_information.si_common.neigh_list. */</span><br><span style="color: hsl(0, 100%, 40%);">-  gsm_net_set_system_infos();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>  /* start control interface after reading config for</span><br><span>   * ctrl_vty_get_bind_addr() */</span><br><span>       bsc_gsmnet->ctrl = bsc_controlif_setup(bsc_gsmnet,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23875">change 23875</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/23875"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5da365c93aedc6668a77b82ee9b68cbec64967e3 </div>
<div style="display:none"> Gerrit-Change-Number: 23875 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>