diff options
| author | Daniel Willmann <dwillmann@sysmocom.de> | 2014-08-07 13:05:43 +0200 |
|---|---|---|
| committer | Daniel Willmann <daniel@totalueberwachung.de> | 2014-08-07 16:12:05 +0200 |
| commit | 93d17110112dc027902032816ce57f5d4819558b (patch) | |
| tree | a1adc3113dc73d087deeecc7fcbda4267113a2d9 /src/poll_controller.cpp | |
| parent | 6a16e0c092bde7ad6d36781d8cbebfe33e9dc780 (diff) | |
poll_controller: Use DL/UL TBFs in PollController::expireTimedout()
Be specific about where we are handling an UL and DL TBF
Ticket: SYS#389
Sponsored by: On-Waves ehf
Diffstat (limited to 'src/poll_controller.cpp')
| -rw-r--r-- | src/poll_controller.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/poll_controller.cpp b/src/poll_controller.cpp index dea75edf..7e1aa787 100644 --- a/src/poll_controller.cpp +++ b/src/poll_controller.cpp @@ -31,26 +31,27 @@ PollController::PollController(BTS& bts) void PollController::expireTimedout(int frame_number) { struct gprs_rlcmac_bts *bts = m_bts.bts_data(); - struct gprs_rlcmac_tbf *tbf; + struct gprs_rlcmac_dl_tbf *dl_tbf; + struct gprs_rlcmac_ul_tbf *ul_tbf; struct gprs_rlcmac_sba *sba, *sba2; struct llist_pods *lpods; uint32_t elapsed; /* check for poll timeout */ - llist_pods_for_each_entry(tbf, &bts->ul_tbfs, list, lpods) { - if (tbf->poll_state == GPRS_RLCMAC_POLL_SCHED) { - elapsed = (frame_number + 2715648 - tbf->poll_fn) + llist_pods_for_each_entry(ul_tbf, &bts->ul_tbfs, list, lpods) { + if (ul_tbf->poll_state == GPRS_RLCMAC_POLL_SCHED) { + elapsed = (frame_number + 2715648 - ul_tbf->poll_fn) % 2715648; if (elapsed >= 20 && elapsed < 2715400) - tbf->poll_timeout(); + ul_tbf->poll_timeout(); } } - llist_pods_for_each_entry(tbf, &bts->dl_tbfs, list, lpods) { - if (tbf->poll_state == GPRS_RLCMAC_POLL_SCHED) { - elapsed = (frame_number + 2715648 - tbf->poll_fn) + llist_pods_for_each_entry(dl_tbf, &bts->dl_tbfs, list, lpods) { + if (dl_tbf->poll_state == GPRS_RLCMAC_POLL_SCHED) { + elapsed = (frame_number + 2715648 - dl_tbf->poll_fn) % 2715648; if (elapsed >= 20 && elapsed < 2715400) - tbf->poll_timeout(); + dl_tbf->poll_timeout(); } } llist_for_each_entry_safe(sba, sba2, &m_bts.sba()->m_sbas, list) { |