pespin has uploaded this change for review.

View Change

Revert "fix fallout from: 'stats: new trackers for lchan life duration'"

This reverts commit a09d78faa97b087e8a17cf29484caf4ffbc27b9e.

The whole original patch is also being reverted, so this fix too.

Change-Id: Ic9b89b3030eb8cfedabbf20ec8fcbcc225fe028f
---
M src/osmo-bsc/lchan_fsm.c
1 file changed, 0 insertions(+), 8 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/89/28089/1

diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index 6854465..d693189 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -528,14 +528,6 @@
 		lchan->mgw_endpoint_ci_bts = NULL;
 	}
 
-	/* Ensure that the osmo_timer in lchan->active_cc is stopped. This is particularly important for lchan FSM
-	 * deallocation, so that the timer is no longer active when the lchan FSM instance gets discarded
-	 * (lchan_fsm_cleanup() calls this function), see OS#5554.
-	 *
-	 * Besides that, it is also good to make sure the timer is stopped when the lchan resets, to avoid any false
-	 * counts being accumulated, however obscure an error situation may be. */
-	osmo_time_cc_cleanup(&lchan->active_cc);
-
 	/* NUL all volatile state */
 	*lchan = (struct gsm_lchan){
 		.ts = lchan->ts,

To view, visit change 28089. To unsubscribe, or for help writing mail filters, visit settings.