laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/28720 )
Change subject: gb/gprs_ns: call osmo_timer_del() unconditionally
......................................................................
gb/gprs_ns: call osmo_timer_del() unconditionally
osmo_timer_del() does check if a timer is active internally.
Change-Id: I3fdfcde33bc6f8a88680ad3f1dde2b6ff8846020
---
M src/gb/gprs_ns.c
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c
index 9f5df8f..e250eda 100644
--- a/src/gb/gprs_ns.c
+++ b/src/gb/gprs_ns.c
@@ -352,8 +352,7 @@
*/
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 @@
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;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28720
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I3fdfcde33bc6f8a88680ad3f1dde2b6ff8846020
Gerrit-Change-Number: 28720
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
