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 c1a5310a3e
.
Change-Id: I5da365c93aedc6668a77b82ee9b68cbec64967e3
This commit is contained in:
parent
c1a5310a3e
commit
8831160631
|
@ -671,7 +671,6 @@ void gsm_bts_all_ts_dispatch(struct gsm_bts *bts, uint32_t ts_ev, void *data);
|
|||
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);
|
||||
|
|
|
@ -168,15 +168,3 @@ struct gsm_bts *bsc_bts_alloc_register(struct gsm_network *net, enum gsm_bts_typ
|
|||
|
||||
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;
|
||||
}
|
||||
|
|
|
@ -2448,11 +2448,6 @@ DEFUN_USRATTR(cfg_bts_ci,
|
|||
}
|
||||
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 @@ DEFUN_USRATTR(cfg_bts_lac,
|
|||
|
||||
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 @@ DEFUN_USRATTR(cfg_bts_bsic,
|
|||
}
|
||||
bts->bsic = bsic;
|
||||
|
||||
if (vty->type != VTY_FILE)
|
||||
gsm_net_set_system_infos();
|
||||
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
|
@ -5360,9 +5347,7 @@ DEFUN_USRATTR(cfg_trx_arfcn,
|
|||
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 */
|
||||
|
||||
|
|
|
@ -722,7 +722,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)
|
||||
{
|
||||
struct gsm_bts_trx *trx;
|
||||
int ret = 0;
|
||||
|
||||
/* Generate a new ID */
|
||||
bts->bcch_change_mark += 1;
|
||||
|
@ -733,10 +732,10 @@ int gsm_bts_set_system_infos(struct gsm_bts *bts)
|
|||
|
||||
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[] = {
|
||||
|
|
|
@ -429,10 +429,6 @@ int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx)
|
|||
|
||||
/* 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
|
||||
|
|
|
@ -183,10 +183,6 @@ static int add_neighbor(struct vty *vty, struct neighbor *n)
|
|||
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 @@ static int del_neighbor(struct vty *vty, struct neighbor *n)
|
|||
|
||||
llist_del(&neighbor->entry);
|
||||
talloc_free(neighbor);
|
||||
|
||||
if (vty->type != VTY_FILE)
|
||||
gsm_bts_set_system_infos(bts);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
|
@ -942,10 +942,6 @@ int main(int argc, char **argv)
|
|||
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,
|
||||
|
|
Loading…
Reference in New Issue