Change in osmo-bts[master]: scheduler: join conditions in trx_sched_set_lchan()

[fixeria]

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


Change subject: scheduler: join conditions in trx_sched_set_lchan()
......................................................................

scheduler: join conditions in trx_sched_set_lchan()

Change-Id: If2b68e3c7bf01badaaa4666198a4a4c5709f0040
---
M src/common/scheduler.c
1 file changed, 8 insertions(+), 6 deletions(-)



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

diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index 86fcef7..328a73f 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -1004,16 +1004,18 @@
 			chan_state->ul_bursts = NULL;
 		}
 
-		if (active)
-			memset(chan_state, 0, sizeof(*chan_state));
-		else
-			chan_state->ho_rach_detect = 0;
-		chan_state->active = active;
-
 		if (active) {
+			/* Clean up everything */
+			memset(chan_state, 0, sizeof(*chan_state));
+
+			/* Bind to generic 'struct gsm_lchan' */
 			chan_state->lchan = get_lchan_by_chan_nr(l1t->trx, chan_nr);
 			OSMO_ASSERT(chan_state->lchan != NULL);
+		} else {
+			chan_state->ho_rach_detect = 0;
 		}
+
+		chan_state->active = active;
 	}
 
 	/* disable handover detection (on deactivation) */

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: If2b68e3c7bf01badaaa4666198a4a4c5709f0040
Gerrit-Change-Number: 20699
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201017/b3438372/attachment.htm>