Change in osmo-bts[master]: trx_sched_clean_ts: Clean VAMOS shadow TS too

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25541 )


Change subject: trx_sched_clean_ts: Clean VAMOS shadow TS too
......................................................................

trx_sched_clean_ts: Clean VAMOS shadow TS too

trx_sched_init_ts does it properly, but apparently it was forgotten to
do the same upon clean up.

Change-Id: Ice751870a46548af42b14846b8482335f636a84a
---
M src/common/scheduler.c
1 file changed, 29 insertions(+), 20 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/25541/1

diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index 6e1e4fb..0826eda 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -653,34 +653,43 @@
 	}
 }
 
+static void trx_sched_clean_ts(struct gsm_bts_trx_ts *ts)
+{
+	struct l1sched_ts *l1ts = ts->priv;
+	unsigned int i;
+
+	msgb_queue_flush(&l1ts->dl_prims);
+	rate_ctr_group_free(l1ts->ctrs);
+	l1ts->ctrs = NULL;
+	for (i = 0; i < _TRX_CHAN_MAX; i++) {
+		struct l1sched_chan_state *chan_state;
+		chan_state = &l1ts->chan_state[i];
+		if (chan_state->dl_bursts) {
+			talloc_free(chan_state->dl_bursts);
+			chan_state->dl_bursts = NULL;
+		}
+		if (chan_state->ul_bursts) {
+			talloc_free(chan_state->ul_bursts);
+			chan_state->ul_bursts = NULL;
+		}
+	}
+	/* clear lchan channel states */
+	for (i = 0; i < ARRAY_SIZE(ts->lchan); i++)
+		lchan_set_state(&ts->lchan[i], LCHAN_S_NONE);
+}
+
 void trx_sched_clean(struct gsm_bts_trx *trx)
 {
-	unsigned int tn, i;
+	unsigned int tn;
 
 	LOGPTRX(trx, DL1C, LOGL_DEBUG, "Clean scheduler structures\n");
 
 	for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) {
 		struct gsm_bts_trx_ts *ts = &trx->ts[tn];
-		struct l1sched_ts *l1ts = ts->priv;
 
-		msgb_queue_flush(&l1ts->dl_prims);
-		rate_ctr_group_free(l1ts->ctrs);
-		l1ts->ctrs = NULL;
-		for (i = 0; i < _TRX_CHAN_MAX; i++) {
-			struct l1sched_chan_state *chan_state;
-			chan_state = &l1ts->chan_state[i];
-			if (chan_state->dl_bursts) {
-				talloc_free(chan_state->dl_bursts);
-				chan_state->dl_bursts = NULL;
-			}
-			if (chan_state->ul_bursts) {
-				talloc_free(chan_state->ul_bursts);
-				chan_state->ul_bursts = NULL;
-			}
-		}
-		/* clear lchan channel states */
-		for (i = 0; i < ARRAY_SIZE(ts->lchan); i++)
-			lchan_set_state(&ts->lchan[i], LCHAN_S_NONE);
+		/* Clean primary and shadow timeslots */
+		trx_sched_clean_ts(ts);
+		trx_sched_clean_ts(ts->vamos.peer);
 	}
 }
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25541
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ice751870a46548af42b14846b8482335f636a84a
Gerrit-Change-Number: 25541
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210922/49806744/attachment.htm>