diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-10-25 18:25:21 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-10-25 18:32:52 +0200 |
| commit | 5c5982067d4eba1f52239fc100c8dfe48202ad77 (patch) | |
| tree | cc0e8041b510bcd17c3f6b3a12868e96d00260b8 | |
| parent | 8a85b71167c4580ddf9e6c59ea602475fd462b3a (diff) | |
Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly"
This reverts commit 8a85b71167c4580ddf9e6c59ea602475fd462b3a.
This is actually the wrong fix. Proper fix comes as a follow-up patch,
since the root cause happens earlier in upper layers. No msg with
l2h=NULL should reach this point of code ever.
Change-Id: Ie23d94924f824bd7e89437ccf73b260f542477c6
| -rw-r--r-- | src/osmo-bts-trx/sched_lchan_pdtch.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index e9e1e828..4c63acb1 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -32,7 +32,6 @@ #include <osmo-bts/logging.h> #include <osmo-bts/scheduler.h> #include <osmo-bts/scheduler_backend.h> -#include <osmo-bts/bts_trx.h> #include <sched_utils.h> @@ -162,10 +161,8 @@ int tx_pdtch_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) /* get mac block from queue */ msg = _sched_dequeue_prim(l1ts, br); - if (!msg || !msg->l2h) { - const struct gsm_bts_trx *trx = l1ts->ts->trx; - if (!msg || trx == trx->bts->c0) - LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); + if (!msg) { + LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); goto no_msg; } |