diff options
| author | Harald Welte <laforge@gnumonks.org> | 2015-11-20 10:54:09 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2015-11-20 10:54:09 +0100 |
| commit | 48e99fd05a906bcf9536996733123fdb512b635e (patch) | |
| tree | 7a54a98f0cbcf39f9f5e4be731514a50e742a8e5 | |
| parent | 3c161bb7df7bf95e5a69db97fe3baa6380c3c9ed (diff) | |
cope with 'struct gsm_bts' without a tsc member
This was introduced in openbsc.git a2bbc5ec0e6481bb5b65da7bdbde03a424437af4
| -rw-r--r-- | src/common/pcu_sock.c | 2 | ||||
| -rw-r--r-- | src/common/vty.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 577cfcfa..f7d3651d 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -210,7 +210,7 @@ int pcu_tx_info_ind(void) && ts->pchan == GSM_PCHAN_PDCH) { info_ind->trx[i].pdch_mask |= (1 << j); info_ind->trx[i].tsc[j] = - (ts->tsc >= 0) ? ts->tsc : bts->tsc; + (ts->tsc >= 0) ? ts->tsc : bts->bsic & 7; LOGP(DPCU, LOGL_INFO, "trx=%d ts=%d: " "available (tsc=%d arfcn=%d)\n", trx->nr, ts->nr, diff --git a/src/common/vty.c b/src/common/vty.c index 0d52dd76..a67ffe1d 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -559,10 +559,10 @@ static void bts_dump_vty(struct vty *vty, struct gsm_bts *bts) struct gsm_bts_role_bts *btsb = bts->role; vty_out(vty, "BTS %u is of %s type in band %s, has CI %u LAC %u, " - "BSIC %u, TSC %u and %u TRX%s", + "BSIC %u and %u TRX%s", bts->nr, "FIXME", gsm_band_name(bts->band), bts->cell_identity, - bts->location_area_code, bts->bsic, bts->tsc, + bts->location_area_code, bts->bsic, bts->num_trx, VTY_NEWLINE); vty_out(vty, " Description: %s%s", bts->description ? bts->description : "(null)", VTY_NEWLINE); |