fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/33156 )
Change subject: osmo-bts-trx: fix tx_pdtch_fn(): do not Tx old bursts ......................................................................
osmo-bts-trx: fix tx_pdtch_fn(): do not Tx old bursts
Change-Id: I4538a8fe6b29f8d6eca33ad27d4a9852e3a3e86c --- M include/osmo-bts/scheduler.h M src/osmo-bts-trx/sched_lchan_pdtch.c 2 files changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/56/33156/1
diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 01e8e2b..f697325 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -66,6 +66,7 @@ #define EGPRS_BURST_LEN 444
enum trx_mod_type { + TRX_MOD_T_NONE = -1, TRX_MOD_T_GMSK, TRX_MOD_T_8PSK, TRX_MOD_T_AQPSK, diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index 1701aaf..91b006f 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -149,8 +149,13 @@ int rc = 0;
/* send burst, if we already got a frame */ - if (br->bid > 0) + if (br->bid > 0) { + if (*mod == TRX_MOD_T_NONE) + return -ENODEV; goto send_burst; + } + + *mod = TRX_MOD_T_NONE;
/* get mac block from queue */ msg = _sched_dequeue_prim(l1ts, br);