From 29e3a2f0f3d3cacdb741d406e43b0c725fffd81e Mon Sep 17 00:00:00 2001 From: Jacob Erlbeck Date: Fri, 5 Feb 2016 19:04:23 +0100 Subject: Revert "tbf: Use the control TS for Immediate Assignments" According to spec, the lowest numbered PDCH of the TBF shall be used for the PACCH, only when concurrent TBF are active, the lowest common PDCH shall be used. An immediate assigment is in general only sent, if no TBF is active, so the latter case never applies. This reverts commit fdd8a1ba2312be3f33576ee994c0b5da6272e815. --- src/bts.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/bts.cpp b/src/bts.cpp index 12f4e726..0d3e32a8 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -525,7 +525,7 @@ int BTS::rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta) LOGP(DRLCMAC, LOGL_INFO, "%s TX: START Immediate " "Assignment Uplink (AGCH)\n", tbf_name(tbf)); trx_no = tbf->trx->trx_no; - ts_no = tbf->control_ts; + ts_no = tbf->first_ts; tfi = tbf->tfi(); usf = tbf->m_usf[ts_no]; tsc = tbf->tsc(); @@ -585,7 +585,7 @@ void BTS::trigger_dl_ass( void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, uint8_t poll, const char *imsi) { int plen; - unsigned int ts = tbf->control_ts; + unsigned int ts = tbf->first_ts; LOGP(DRLCMAC, LOGL_INFO, "TX: START %s Immediate Assignment Downlink (PCH)\n", tbf_name(tbf)); bitvec *immediate_assignment = bitvec_alloc(22); /* without plen */ -- cgit v1.2.3