Change in osmo-pcu[master]: Remove unneeded poll_state check

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23528 )

Change subject: Remove unneeded poll_state check
......................................................................

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
---
M src/tbf.cpp
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved
  laforge: Looks good to me, but someone else must approve
  dexter: Looks good to me, but someone else must approve



diff --git a/src/tbf.cpp b/src/tbf.cpp
index 8520a1b..4a57375 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -866,8 +866,7 @@
 		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 @@
 	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;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23528
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I5e12280a6835407fa452bd4d5df799d2672790ec
Gerrit-Change-Number: 23528
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210412/7d4782b3/attachment.htm>