[MERGED] osmo-bts[master]: osmo-bts-trx: fix scheduling of broken frames

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Thu Mar 23 10:03:28 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: osmo-bts-trx: fix scheduling of broken frames
......................................................................


osmo-bts-trx: fix scheduling of broken frames

* DTXu: don't set marker for broken frames
* do not attempt to send 0-length bursts to avoid flood of errors after
  bts startup

Change-Id: Icb536f951386b9abe34c0dacbb203f3db1e41bb3
---
M src/osmo-bts-trx/scheduler_trx.c
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index 9c676d7..aca073a 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -1236,7 +1236,8 @@
 		rc = tch_hr_decode(tch_data, *bursts_p,
 			(((fn + 26 - 10) % 26) >> 2) & 1,
 			&n_errors, &n_bits_total);
-		lchan_set_marker(osmo_hr_check_sid(tch_data, rc), lchan); /* DTXu */
+		if (rc) /* DTXu */
+			lchan_set_marker(osmo_hr_check_sid(tch_data, rc), lchan);
 		break;
 	case GSM48_CMODE_SPEECH_AMR: /* AMR */
 		/* the first FN 0,8,17 or 1,9,18 defines that CMI is included
@@ -1375,7 +1376,8 @@
 				continue;
 			} else
 				gain = 0;
-			trx_if_data(l1h, tn, fn, gain, bits, nbits);
+			if (nbits)
+				trx_if_data(l1h, tn, fn, gain, bits, nbits);
 		}
 	}
 

-- 
To view, visit https://gerrit.osmocom.org/1776
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icb536f951386b9abe34c0dacbb203f3db1e41bb3
Gerrit-PatchSet: 5
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Tom Tsou <tom at tsou.cc>



More information about the gerrit-log mailing list