tbf: Get rid of unneeded poll_scheduled()
This API is not really needed anymore, since anyway it works under the
assumption there can only be 1 POLL in transit per TBF, which isn't
necessarily true.
Change-Id: I875f51cade95faeb2d79dcebfead4c83e23a731b
diff --git a/src/tbf.h b/src/tbf.h
index 83c1b70..5064216 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -221,7 +221,6 @@
bool dl_ass_state_is(enum gprs_rlcmac_tbf_dl_ass_state rhs) const;
bool ul_ass_state_is(enum gprs_rlcmac_tbf_ul_ass_state rhs) const;
bool ul_ack_state_is(enum gprs_rlcmac_tbf_ul_ack_state rhs) const;
- bool poll_scheduled() const;
void set_state(enum gprs_rlcmac_tbf_state new_state, const char *file, int line);
void set_ass_state_dl(enum gprs_rlcmac_tbf_dl_ass_state new_state, const char *file, int line);
void set_ass_state_ul(enum gprs_rlcmac_tbf_ul_ass_state new_state, const char *file, int line);
@@ -381,11 +380,6 @@
return ul_ack_state == rhs;
}
-inline bool gprs_rlcmac_tbf::poll_scheduled() const
-{
- return poll_state == GPRS_RLCMAC_POLL_SCHED;
-}
-
inline bool gprs_rlcmac_tbf::state_is_not(enum gprs_rlcmac_tbf_state rhs) const
{
return state != rhs;
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index a59b03b..ba5c651 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -1321,9 +1321,6 @@
bool gprs_rlcmac_dl_tbf::need_control_ts() const
{
- if (poll_scheduled())
- return false;
-
return state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK) ||
m_tx_counter >= POLL_ACK_AFTER_FRAMES ||
m_dl_ack_requested;
diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp
index 063d0ff..ff291ef 100644
--- a/src/tbf_ul.cpp
+++ b/src/tbf_ul.cpp
@@ -295,7 +295,7 @@
uint32_t new_poll_fn = 0;
if (final) {
- if (poll_scheduled() && ul_ack_state_is(GPRS_RLCMAC_UL_ACK_WAIT_ACK)) {
+ if (ul_ack_state_is(GPRS_RLCMAC_UL_ACK_WAIT_ACK)) {
LOGPTBFUL(this, LOGL_DEBUG,
"Polling is already scheduled, so we must wait for the final uplink ack...\n");
return NULL;