diff options
Diffstat (limited to 'src/tbf.cpp')
| -rw-r--r-- | src/tbf.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tbf.cpp b/src/tbf.cpp index 547612f6..ddb3fbb8 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -123,7 +123,7 @@ static int tbf_new_dl_assignment(struct gprs_rlcmac_bts *bts, tbf = tbf_by_tlli(tlli, GPRS_RLCMAC_UL_TBF); if (tbf && tbf->dir.ul.contention_resolution_done && !tbf->dir.ul.final_ack_sent) { - use_trx = tbf->trx; + use_trx = tbf->trx_no; ta = tbf->ta; ss = 0; old_tbf = tbf; @@ -248,7 +248,7 @@ static void tbf_unlink_pdch(struct gprs_rlcmac_tbf *tbf) int ts; if (tbf->direction == GPRS_RLCMAC_UL_TBF) { - bts->trx[tbf->trx].ul_tbf[tbf->tfi] = NULL; + bts->trx[tbf->trx_no].ul_tbf[tbf->tfi] = NULL; for (ts = 0; ts < 8; ts++) { pdch = tbf->pdch[ts]; if (pdch) @@ -256,7 +256,7 @@ static void tbf_unlink_pdch(struct gprs_rlcmac_tbf *tbf) tbf->pdch[ts] = NULL; } } else { - bts->trx[tbf->trx].dl_tbf[tbf->tfi] = NULL; + bts->trx[tbf->trx_no].dl_tbf[tbf->tfi] = NULL; for (ts = 0; ts < 8; ts++) { pdch = tbf->pdch[ts]; if (pdch) @@ -445,14 +445,14 @@ struct gprs_rlcmac_tbf *tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) llist_for_each_entry(tbf, &gprs_rlcmac_ul_tbfs, list) { if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->poll_state == GPRS_RLCMAC_POLL_SCHED - && tbf->poll_fn == fn && tbf->trx == trx + && tbf->poll_fn == fn && tbf->trx_no == trx && tbf->control_ts == ts) return tbf; } llist_for_each_entry(tbf, &gprs_rlcmac_dl_tbfs, list) { if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->poll_state == GPRS_RLCMAC_POLL_SCHED - && tbf->poll_fn == fn && tbf->trx == trx + && tbf->poll_fn == fn && tbf->trx_no == trx && tbf->control_ts == ts) return tbf; } @@ -502,7 +502,7 @@ next_diagram: #endif tbf->direction = dir; tbf->tfi = tfi; - tbf->trx = trx; + tbf->trx_no = trx; tbf->arfcn = bts->trx[trx].arfcn; tbf->ms_class = ms_class; tbf->ws = 64; |