fixeria has uploaded this change for review.
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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/56/28956/1
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 change 28956. To unsubscribe, or for help writing mail filters, visit settings.