From b6629ddfc9e35c67d8b8d50700ce582f2a66dbcf Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Fri, 22 Jul 2022 03:34:02 +0700 Subject: gb/gprs_ns: call osmo_timer_del() unconditionally osmo_timer_del() does check if a timer is active internally. Change-Id: I3fdfcde33bc6f8a88680ad3f1dde2b6ff8846020 --- src/gb/gprs_ns.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 9f5df8f7..e250eda8 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -352,8 +352,7 @@ struct gprs_nsvc *gprs_nsvc_create2(struct gprs_ns_inst *nsi, uint16_t nsvci, */ void gprs_nsvc_delete(struct gprs_nsvc *nsvc) { - if (osmo_timer_pending(&nsvc->timer)) - osmo_timer_del(&nsvc->timer); + osmo_timer_del(&nsvc->timer); llist_del(&nsvc->list); rate_ctr_group_free(nsvc->ctrg); osmo_stat_item_group_free(nsvc->statg); @@ -750,8 +749,7 @@ static void nsvc_start_timer(struct gprs_nsvc *nsvc, enum nsvc_timer_mode mode) nsvc->nsei, get_value_string(timer_mode_strs, mode), seconds); - if (osmo_timer_pending(&nsvc->timer)) - osmo_timer_del(&nsvc->timer); + osmo_timer_del(&nsvc->timer); osmo_gettimeofday(&nsvc->timer_started, NULL); nsvc->timer_mode = mode; -- cgit v1.2.3