Change in osmo-bts[master]: trx_sched_is_sacch_fn(): fix handling of dynamic timeslots

laforge gerrit-no-reply at lists.osmocom.org
Fri Jun 4 20:06:59 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24526 )

Change subject: trx_sched_is_sacch_fn(): fix handling of dynamic timeslots
......................................................................

trx_sched_is_sacch_fn(): fix handling of dynamic timeslots

There is no GSM_PCHAN_TCH_F{_TCH_H}_PDCH in trx_sched_multiframes[],
so find_sched_mframe_idx() would always return -1 for these.  Fix
this by using ts_pchan(), which returns currently active pchan type.

Change-Id: Ia5e337e897b595e7de6e504664c969b583cc02a1
---
M src/common/scheduler_mframe.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, approved
  dexter: Looks good to me, but someone else must approve
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/common/scheduler_mframe.c b/src/common/scheduler_mframe.c
index b969407..f6476ec 100644
--- a/src/common/scheduler_mframe.c
+++ b/src/common/scheduler_mframe.c
@@ -1007,7 +1007,7 @@
 	const struct trx_sched_frame *frame;
 	enum trx_chan_type ch_type;
 
-	i = find_sched_mframe_idx(ts->pchan, ts->nr);
+	i = find_sched_mframe_idx(ts_pchan(ts), ts->nr);
 	if (i < 0)
 		return -EINVAL;
 	sched = &trx_sched_multiframes[i];

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ia5e337e897b595e7de6e504664c969b583cc02a1
Gerrit-Change-Number: 24526
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210604/a9dd4324/attachment.htm>


More information about the gerrit-log mailing list