laforge submitted this change.

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

osmo-bts-trx: call osmo_timer_del() unconditionally

osmo_timer_del() does check if a timer is active internally.

Change-Id: I16dca28120061ffc1f118d1e4a1ea986c1639bf7
---
M src/osmo-bts-trx/trx_if.c
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index bff10d7..ba29788 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -685,8 +685,7 @@
 	LOGPPHI(l1h->phy_inst, DTRX, LOGL_INFO, "Response message: '%s'\n", buf);
 
 	/* abort timer and send next message, if any */
-	if (osmo_timer_pending(&l1h->trx_ctrl_timer))
-		osmo_timer_del(&l1h->trx_ctrl_timer);
+	osmo_timer_del(&l1h->trx_ctrl_timer);
 
 	/* get command for response message */
 	if (llist_empty(&l1h->trx_ctrl_list)) {
@@ -1222,8 +1221,7 @@
 	l1h->last_acked = NULL;
 
 	/* Tx queue is now empty, so there's no point in keeping the retrans timer armed: */
-	if (osmo_timer_pending(&l1h->trx_ctrl_timer))
-		osmo_timer_del(&l1h->trx_ctrl_timer);
+	osmo_timer_del(&l1h->trx_ctrl_timer);
 }
 
 /*! close the TRX for given handle (data + control socket) */

To view, visit change 28723. To unsubscribe, or for help writing mail filters, visit settings.