fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30242 )
Change subject: trxcon: rx_sch_fn(): do not use sched->fn_counter_proc
......................................................................
trxcon: rx_sch_fn(): do not use sched->fn_counter_proc
Use the given Fn instead, no need to go that deep for it. The
sched->fn_counter_proc is an internal field of the scheduler,
which is not necessarily holding a valid value when pulling
Uplink bursts synchronously via the Ready-to-Send PHYIF API.
Change-Id: I56027876b50e53b474c2f54ac216cd141142020e
Related: OS#5599
---
M src/host/trxcon/src/sched_lchan_sch.c
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
msuraev: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/host/trxcon/src/sched_lchan_sch.c
b/src/host/trxcon/src/sched_lchan_sch.c
index c61e134..d943ae8 100644
--- a/src/host/trxcon/src/sched_lchan_sch.c
+++ b/src/host/trxcon/src/sched_lchan_sch.c
@@ -85,13 +85,14 @@
/* Decode BSIC and TDMA frame number */
decode_sb(&time, &bsic, sb_info);
- LOGP_LCHAND(lchan, LOGL_DEBUG, "Received SCH: bsic=%u, fn=%u,
sched_fn=%u\n",
- bsic, time.fn, lchan->ts->sched->fn_counter_proc);
+ LOGP_LCHAND(lchan, LOGL_DEBUG,
+ "Received SCH: bsic=%u, fn=%u, sched_fn=%u\n",
+ bsic, time.fn, fn);
/* Check if decoded frame number matches */
if (time.fn != fn) {
LOGP_LCHAND(lchan, LOGL_ERROR,
- "Decoded fn=%u does not match fn=%u provided by
scheduler\n",
+ "Decoded fn=%u does not match sched_fn=%u\n",
time.fn, fn);
return -EINVAL;
}
4 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30242
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I56027876b50e53b474c2f54ac216cd141142020e
Gerrit-Change-Number: 30242
Gerrit-PatchSet: 6
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: msuraev <[email protected]>
Gerrit-MessageType: merged
