diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2022-04-10 01:54:28 +0300 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2022-04-10 19:07:16 +0300 |
| commit | 3ed84cc26b8f54c2d45e0056a64cfd69358570cc (patch) | |
| tree | ddbc2bb6a2d53126fd2b0b41091e186ffb467681 | |
| parent | 3ac0cf8c398f19d51f819bf829d4a1b0d68d0ee9 (diff) | |
osmo-bts-{trx,virtual}: tx_tchh_fn(): remove FACCH/H alignment check
This check is redundant because it's guaranteed in rts_tchh_fn()
that FACCH/H is always scheduled at the correct frame offset.
Change-Id: I2f0c26f6007455aa1e3e8b27bc9d173f6b1f8c38
Related: SYS#5916, OS#5518
| -rw-r--r-- | src/osmo-bts-trx/sched_lchan_tchh.c | 8 | ||||
| -rw-r--r-- | src/osmo-bts-virtual/scheduler_virtbts.c | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 05e8e7ec..c9811da1 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -374,14 +374,6 @@ int tx_tchh_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) /* get TCH and/or FACCH */ tx_tch_common(l1ts, br, &msg_tch, &msg_facch); - /* check for FACCH alignment */ - if (msg_facch && ((((br->fn + 4) % 26) >> 2) & 1)) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, - "Cannot transmit FACCH starting on even frames, please fix RTS!\n"); - msgb_free(msg_facch); - msg_facch = NULL; - } - /* BURST BYPASS */ /* allocate burst memory, if not already, diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index 9d2adfc3..8557638a 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -449,14 +449,6 @@ int tx_tchh_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) /* get TCH and/or FACCH */ tx_tch_common(l1ts, br, &msg_tch, &msg_facch, (((br->fn + 4) % 26) >> 2) & 1); - /* check for FACCH alignment */ - if (msg_facch && ((((br->fn + 4) % 26) >> 2) & 1)) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Cannot transmit FACCH starting on " - "even frames, please fix RTS!\n"); - msgb_free(msg_facch); - msg_facch = NULL; - } - /* no message at all */ if (!msg_tch && !msg_facch && !chan_state->dl_ongoing_facch) { LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "has not been served !! No prim\n"); |