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

2018-03-11 Thread Vadim Yanitskiy
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 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 


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

2018-03-11 Thread Harald Welte

Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I7beee7e797f488d04c3b59bee9501ce823717092
Gerrit-PatchSet: 1
Gerrit-Project: osmocom-bb
Gerrit-Branch: fixeria/trx
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No


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

2018-03-11 Thread Vadim Yanitskiy

Review at  https://gerrit.osmocom.org/7215

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(-)


  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/15/7215/1

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: newchange
Gerrit-Change-Id: I7beee7e797f488d04c3b59bee9501ce823717092
Gerrit-PatchSet: 1
Gerrit-Project: osmocom-bb
Gerrit-Branch: fixeria/trx
Gerrit-Owner: Vadim Yanitskiy