diff options
| author | Alexander Chemeris <Alexander.Chemeris@gmail.com> | 2017-07-11 01:42:41 +0630 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-08-27 03:52:46 +0200 |
| commit | 0796a6c0fcd31f2d52a50a1ffd699897d658b088 (patch) | |
| tree | a75046818819e35cd48083413d1fcb9bf696d236 /src/libcommon/gsm_data.c | |
| parent | 256867da516e9537caddbc7b124598ebdc9ceb34 (diff) | |
libcommon: Fix log output for bts>0.
Fixes regression probably introduced in c696cc28.
For bts>0 logging doesn't show bts number correctly when printing lchan
identification string - it will always show it as "bts=0". The reason for
this is that the identification string is cached before bts->nr value is
set to a proper value.
This patch sets bts->nr as part of the first step of the bts structure
initialization, before caching happens thus making sure the cached
identification string is cached with the correct values.
Change-Id: I61c18a7f021fcb1ec00d34a745f4e3ab03416c2d
Diffstat (limited to 'src/libcommon/gsm_data.c')
| -rw-r--r-- | src/libcommon/gsm_data.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libcommon/gsm_data.c b/src/libcommon/gsm_data.c index b5bf0599e..7be224082 100644 --- a/src/libcommon/gsm_data.c +++ b/src/libcommon/gsm_data.c @@ -254,12 +254,13 @@ struct gsm_bts *gsm_bts_alloc_register(struct gsm_network *net, enum gsm_bts_typ if (!model && type != GSM_BTS_TYPE_UNKNOWN) return NULL; - bts = gsm_bts_alloc(net); + bts = gsm_bts_alloc(net, net->num_bts); if (!bts) return NULL; + net->num_bts++; + bts->network = net; - bts->nr = net->num_bts++; bts->type = type; bts->model = model; bts->bsic = bsic; |