diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-11-28 00:13:08 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-11-29 17:37:18 +0000 |
| commit | 9c6d01173b4338138f879641716674833619fdf8 (patch) | |
| tree | a3d288a1aa19ed122d25b63b876afc512472d950 /src/libcommon | |
| parent | 17f2adb0a4ec0c579ab2883bc01293a0fd2f01a8 (diff) | |
HO prep: pass gsm_network to gsm_bts_alloc() already
Prepare for a future change that accesses bts->network during gsm_bts_alloc().
Currently, gsm_bts_alloc() takes a ctx parameter, and gsm_bts_alloc_register()
then gets the gsm_network pointer and sets bts->network to it. All callers
anyway pass gsm_network as ctx to gsm_bts_alloc(), and anything else would not
make sense anyway. So enforce passing exactly gsm_network to gsm_bts_alloc()
and already set the bts->network pointer from there.
Prepares-for: I00870a5828703cf397776668d3301c0c3a4e033a
Change-Id: Ie590c14aa08df4c4f345596b23e5226c5577057a
Diffstat (limited to 'src/libcommon')
| -rw-r--r-- | src/libcommon/gsm_data.c | 1 | ||||
| -rw-r--r-- | src/libcommon/gsm_data_shared.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libcommon/gsm_data.c b/src/libcommon/gsm_data.c index ef72881c5..6a78e3a3c 100644 --- a/src/libcommon/gsm_data.c +++ b/src/libcommon/gsm_data.c @@ -261,7 +261,6 @@ struct gsm_bts *gsm_bts_alloc_register(struct gsm_network *net, enum gsm_bts_typ net->num_bts++; - bts->network = net; bts->type = type; bts->model = model; bts->bsic = bsic; diff --git a/src/libcommon/gsm_data_shared.c b/src/libcommon/gsm_data_shared.c index 8480892b5..e4ae339fc 100644 --- a/src/libcommon/gsm_data_shared.c +++ b/src/libcommon/gsm_data_shared.c @@ -309,9 +309,9 @@ static const struct gprs_rlc_cfg rlc_cfg_default = { .initial_mcs = 6, }; -struct gsm_bts *gsm_bts_alloc(void *ctx, uint8_t bts_num) +struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, uint8_t bts_num) { - struct gsm_bts *bts = talloc_zero(ctx, struct gsm_bts); + struct gsm_bts *bts = talloc_zero(net, struct gsm_bts); int i; if (!bts) @@ -320,6 +320,8 @@ struct gsm_bts *gsm_bts_alloc(void *ctx, uint8_t bts_num) bts->nr = bts_num; bts->num_trx = 0; INIT_LLIST_HEAD(&bts->trx_list); + bts->network = net; + bts->ms_max_power = 15; /* dBm */ gsm_mo_init(&bts->mo, bts, NM_OC_BTS, |