[MERGED] osmocom-bb[fixeria/trx]: trxcon/sched_lchan_xcch.c: always send data indications

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/.

Vadim Yanitskiy gerrit-no-reply at lists.osmocom.org
Sun Mar 11 11:19:08 UTC 2018


Vadim Yanitskiy has submitted this change and it was merged.

Change subject: trxcon/sched_lchan_xcch.c: always send data indications
......................................................................


trxcon/sched_lchan_xcch.c: always send data indications

We shall always send data frame indications, even if received
frame is incomplete or decoding was failed. This is required
for proper Measurement Reporting.

Change-Id: I7beee7e797f488d04c3b59bee9501ce823717092
---
M src/host/trxcon/sched_lchan_xcch.c
1 file changed, 9 insertions(+), 6 deletions(-)

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



diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c
index f351674..04c9f4e 100644
--- a/src/host/trxcon/sched_lchan_xcch.c
+++ b/src/host/trxcon/sched_lchan_xcch.c
@@ -94,8 +94,6 @@
 			(*first_fn) % ts->mf_layout->period,
 			ts->mf_layout->period,
 			lchan_desc->name);
-
-		return -1;
 	}
 
 	/* Attempt to decode */
@@ -106,13 +104,18 @@
 			(*first_fn) % ts->mf_layout->period,
 			ts->mf_layout->period,
 			lchan_desc->name);
+
+		/**
+		 * We should anyway send dummy frame for
+		 * proper measurement reporting...
+		 */
+		return sched_send_dt_ind(trx, ts, lchan, NULL, 0,
+			n_errors, true, false);
 	}
 
 	/* Send a L2 frame to the higher layers */
-	sched_send_dt_ind(trx, ts, lchan, l2, GSM_MACBLOCK_LEN,
-		n_errors, rc != 0, false);
-
-	return 0;
+	return sched_send_dt_ind(trx, ts, lchan, l2, GSM_MACBLOCK_LEN,
+		n_errors, false, false);
 }
 
 int tx_data_fn(struct trx_instance *trx, struct trx_ts *ts,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7beee7e797f488d04c3b59bee9501ce823717092
Gerrit-PatchSet: 2
Gerrit-Project: osmocom-bb
Gerrit-Branch: fixeria/trx
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>



More information about the gerrit-log mailing list