diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-05-19 16:30:50 +0200 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2021-05-23 10:30:44 +0000 |
| commit | 22707603253b4772eb498632a4f3eb2e792a9424 (patch) | |
| tree | 54dbf53928769aa2f0eca2a5f55b3f6d5123fd2a /src/osmo-bsc/bts_ipaccess_nanobts.c | |
| parent | c328cade9b2cc238b1e90c6ac44e9457edabb903 (diff) | |
bsc: Clean up TS selection in ipaccess_sign_link_up/down
Change-Id: I3e60ebc979010830a5c40112824893a640c58fd4
Diffstat (limited to 'src/osmo-bsc/bts_ipaccess_nanobts.c')
| -rw-r--r-- | src/osmo-bsc/bts_ipaccess_nanobts.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 16fa20121..7fb7948ab 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -678,10 +678,11 @@ ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, struct e1inp_sign_link *sign_link = NULL; struct timespec tp; int rc; + struct e1inp_ts *sign_ts = e1inp_line_ipa_oml_ts(line); bts = find_bts_by_unitid(bsc_gsmnet, dev->site_id, dev->bts_id); if (!bts) { - ipaccess_sign_link_reject(dev, &line->ts[E1INP_SIGN_OML - 1]); + ipaccess_sign_link_reject(dev, sign_ts); return NULL; } DEBUGP(DLINP, "%s: Identified BTS %u/%u/%u\n", e1inp_signtype_name(type), @@ -701,7 +702,7 @@ ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, /* create new OML link. */ sign_link = bts->oml_link = - e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML - 1], + e1inp_sign_link_create(sign_ts, E1INP_SIGN_OML, bts->c0, bts->oml_tei, 0); rc = clock_gettime(CLOCK_MONOTONIC, &tp); @@ -726,7 +727,7 @@ ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, /* set new RSL link for this TRX. */ line = bts->oml_link->ts->line; - ts = &line->ts[E1INP_SIGN_RSL + dev->trx_id - 1]; + ts = e1inp_line_ipa_rsl_ts(line, dev->trx_id); e1inp_ts_config_sign(ts, line); sign_link = trx->rsl_link = e1inp_sign_link_create(ts, E1INP_SIGN_RSL, @@ -751,7 +752,7 @@ ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, static void ipaccess_sign_link_down(struct e1inp_line *line) { /* No matter what link went down, we close both signal links. */ - struct e1inp_ts *ts = &line->ts[E1INP_SIGN_OML-1]; + struct e1inp_ts *ts = e1inp_line_ipa_oml_ts(line); struct gsm_bts *bts = NULL; struct e1inp_sign_link *link; |