aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/src/libcommon
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2015-11-20 10:43:31 +0100
committerHarald Welte <laforge@gnumonks.org>2015-11-20 10:43:31 +0100
commita2bbc5ec0e6481bb5b65da7bdbde03a424437af4 (patch)
tree9833ff4c1d87c96db2df8a81fe4b9aa4ce584ed4 /openbsc/src/libcommon
parentae2c18c57b5b8d2133a42297fb7ce02a8f332cce (diff)
Fix TSC/BSIC handling bug and remove bts->tsc
This fixes a bug in the following circumstances: * BSIC is set to 0 in the config file * No TSC is explicitly specified at the BST level in the config file In this case, we ended up using BSIC=0 and TSC=7, as TSC=7 is our default initialization value. The TSC of the CCCH/BCCH must always be the BCC, which is the lower 3 bits of the BSIC. Having configuration options for both the BSIC _and_ the TSC at the BTS level therefore makes no sense, as it only adds ways in which users can configure non-oprational configurations. So we remove the bts->tsc member, and keep only the ts->tsc members that allow us to configure a timeslot-specific TSC that's different from the BTS TSC (= BCC).
Diffstat (limited to 'openbsc/src/libcommon')
-rw-r--r--openbsc/src/libcommon/gsm_data.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/openbsc/src/libcommon/gsm_data.c b/openbsc/src/libcommon/gsm_data.c
index 4ce4ecac7..16035edcc 100644
--- a/openbsc/src/libcommon/gsm_data.c
+++ b/openbsc/src/libcommon/gsm_data.c
@@ -294,7 +294,7 @@ int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type)
}
struct gsm_bts *gsm_bts_alloc_register(struct gsm_network *net, enum gsm_bts_type type,
- uint8_t tsc, uint8_t bsic)
+ uint8_t bsic)
{
struct gsm_bts_model *model = bts_model_find(type);
struct gsm_bts *bts;
@@ -310,7 +310,6 @@ struct gsm_bts *gsm_bts_alloc_register(struct gsm_network *net, enum gsm_bts_typ
bts->nr = net->num_bts++;
bts->type = type;
bts->model = model;
- bts->tsc = tsc;
bts->bsic = bsic;
bts->neigh_list_manual_mode = 0;