Change in osmo-trx[master]: threshold_timer_update_intv(): call osmo_timer_del() unconditionally

[laforge]

laforge has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-trx/+/28956 )

Change subject: threshold_timer_update_intv(): call osmo_timer_del() 
unconditionally
......................................................................

threshold_timer_update_intv(): call osmo_timer_del() unconditionally

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

Change-Id: Icaf6f31a3235a3fb6993fa2bb35190150e35c2c2
---
M CommonLibs/trx_rate_ctr.cpp
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp
index a7467c1..3806268 100644
--- a/CommonLibs/trx_rate_ctr.cpp
+++ b/CommonLibs/trx_rate_ctr.cpp
@@ -312,8 +312,7 @@
                return;

        if (llist_empty(&threshold_list)) {
-               if (osmo_timer_pending(&threshold_timer))
-                       osmo_timer_del(&threshold_timer);
+               osmo_timer_del(&threshold_timer);
                return;
        }


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

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Icaf6f31a3235a3fb6993fa2bb35190150e35c2c2
Gerrit-Change-Number: 28956
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged