commit e33c236db0e1b6986dee20d0614216b5c3147e6c
author Vadim Yanitskiy <vyanitskiy@sysmocom.de> Fri Jul 22 03:44:44 2022 +0700
committer laforge <laforge@osmocom.org> Mon Aug 08 20:22:41 2022 +0000
tree f68eae8b4e26c2160529513fe699c6b25bdf6f79
parent 8942a2c72f128a9091363fa1fd1224e9fb96e5e2

{ms,gprs_pcu}_talloc_destructor(): call osmo_timer_del() unconditionally

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

Change-Id: I062c7636b59714860fa6b49a2d59c6528ebd57e3

src/gprs_ms.c

diff --git a/src/gprs_ms.c b/src/gprs_ms.c
index 6daab31..3ed4244 100644
--- a/src/gprs_ms.c
+++ b/src/gprs_ms.c
@@ -142,8 +142,7 @@
 
 	ms_set_reserved_slots(ms, NULL, 0, 0);
 
-	if (osmo_timer_pending(&ms->timer))
-		osmo_timer_del(&ms->timer);
+	osmo_timer_del(&ms->timer);
 
 	if (ms->ul_tbf) {
 		tbf_set_ms((struct gprs_rlcmac_tbf *)ms->ul_tbf, NULL);

src/gprs_pcu.c

diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c
index ecb7f29..de6b669 100644
--- a/src/gprs_pcu.c
+++ b/src/gprs_pcu.c
@@ -65,8 +65,7 @@
 	while ((bts = llist_first_entry_or_null(&pcu->bts_list, struct gprs_rlcmac_bts, list)))
 		talloc_free(bts);
 
-	if (osmo_timer_pending(&pcu->update_stats_timer))
-		osmo_timer_del(&pcu->update_stats_timer);
+	osmo_timer_del(&pcu->update_stats_timer);
 	neigh_cache_free(pcu->neigh_cache);
 	si_cache_free(pcu->si_cache);
 	return 0;