Change in osmo-bts[master]: Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly"

[pespin]

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


Change subject: Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly"
......................................................................

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
---
M src/osmo-bts-trx/sched_lchan_pdtch.c
1 file changed, 2 insertions(+), 5 deletions(-)



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

diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c
index e9e1e82..4c63acb 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 @@
 
 	/* 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;
 	}
 

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ie23d94924f824bd7e89437ccf73b260f542477c6
Gerrit-Change-Number: 25943
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211025/b5e6917b/attachment.htm>