diff options
| author | Daniel Willmann <daniel@totalueberwachung.de> | 2017-02-14 20:36:27 +0100 |
|---|---|---|
| committer | Daniel Willmann <daniel@totalueberwachung.de> | 2017-02-14 20:36:27 +0100 |
| commit | 1a2ff06d206fc4ff3cb8170ebe2b5570addc5be3 (patch) | |
| tree | 6d85ee3109b7ef7bfcfa463d210f92d1782f508e | |
| parent | af0ed4ee1417d165a530dcfc319143c4989c1444 (diff) | |
osmo-bts-sysmo: Fix power ramping merge conflicts
bts->c0 is the first trx. Don't overwrite power_params.trx_p_max_out_mdBm
after setting it with the new functions.
Ticket: SYS#3214
| -rw-r--r-- | src/osmo-bts-sysmo/main.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index cb8d5a65..641df534 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -121,14 +121,9 @@ int bts_model_init(struct gsm_bts *bts) fill_trx_power_params(trx, fl1h); } + /* nominal_power is not used anywhere except read/write in VTY */ rc = get_p_max_out_mdBm(bts->c0); - if (rc < 0) { - LOGP(DL1C, LOGL_NOTICE, "Cannot determine nominal " - "transmit power. Assuming 23dBm.\n"); - rc = 23; - } - bts->c0->nominal_power = rc; - bts->c0->power_params.trx_p_max_out_mdBm = to_mdB(rc); + bts->c0->nominal_power = rc/1000; bts_model_vty_init(bts); |