From feee2b9b838d55fa89439466db0bfb696d7bd0e6 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 29 Mar 2021 17:08:16 +0200 Subject: Remove unneeded poll_state check The related ul_ass_state already implies polling is ongoing since we are waiting for an ACK to be received from MS. Hence there's no need to check poll_state there. Change-Id: I5e12280a6835407fa452bd4d5df799d2672790ec --- src/tbf.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/tbf.cpp b/src/tbf.cpp index 8520a1ba..4a573750 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -866,8 +866,7 @@ struct msgb *gprs_rlcmac_tbf::create_dl_ass(uint32_t fn, uint8_t ts) poll_ass_dl = 0; } if (poll_ass_dl) { - if (poll_state == GPRS_RLCMAC_POLL_SCHED && - ul_ass_state == GPRS_RLCMAC_UL_ASS_WAIT_ACK) + if (ul_ass_state == GPRS_RLCMAC_UL_ASS_WAIT_ACK) { LOGPTBF(this, LOGL_DEBUG, "Polling is already scheduled, so we must wait for the uplink assignment...\n"); @@ -997,8 +996,7 @@ struct msgb *gprs_rlcmac_tbf::create_ul_ass(uint32_t fn, uint8_t ts) unsigned int rrbp; uint32_t new_poll_fn; - if (poll_state == GPRS_RLCMAC_POLL_SCHED && - ul_ass_state == GPRS_RLCMAC_UL_ASS_WAIT_ACK) { + if (ul_ass_state == GPRS_RLCMAC_UL_ASS_WAIT_ACK) { LOGPTBFUL(this, LOGL_DEBUG, "Polling is already scheduled, so we must wait for the uplink assignment...\n"); return NULL; -- cgit v1.2.3