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
This commit is contained in:
Pau Espin 2021-03-29 17:08:16 +02:00
parent 42445ea944
commit feee2b9b83
1 changed files with 2 additions and 4 deletions

View File

@ -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;