[MERGED] osmo-bts[master]: Revert "osmo-bts-sysmo: Include frame number in MEAS IND"

[dexter]

dexter has submitted this change and it was merged.

Change subject: Revert "osmo-bts-sysmo: Include frame number in MEAS IND"
......................................................................


Revert "osmo-bts-sysmo: Include frame number in MEAS IND"

This reverts commit 3f97e4b1fcdc788345ab7740bd4fb8a3d73f5526.

Change-Id: Ib50c813c470bf6ea740fe6667431eaa1a23fdd8d
---
M src/osmo-bts-sysmo/l1_if.c
1 file changed, 2 insertions(+), 7 deletions(-)

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



diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 837fc5c..05805b8 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -897,7 +897,7 @@
 }
 
 static int process_meas_res(struct gsm_bts_trx *trx, uint8_t chan_nr,
-			    uint32_t fn, GsmL1_MeasParam_t *m)
+				GsmL1_MeasParam_t *m)
 {
 	struct osmo_phsap_prim l1sap;
 	memset(&l1sap, 0, sizeof(l1sap));
@@ -908,11 +908,6 @@
 	l1sap.u.info.u.meas_ind.ta_offs_qbits = m->i16BurstTiming;
 	l1sap.u.info.u.meas_ind.ber10k = (unsigned int) (m->fBer * 100);
 	l1sap.u.info.u.meas_ind.inv_rssi = (uint8_t) (m->fRssi * -1);
-
-	/* The MEAS IND data structure expects a logical frame number. On the
-	 * physical radio link, the uplink is delayed by 3 timeslots, we need
-	 * to compensate for that delay. */
-	l1sap.u.info.u.meas_ind.fn = fn + 3;
 
 	/* l1sap wants to take msgb ownership.  However, as there is no
 	 * msg, it will msgb_free(l1sap.oph.msg == NULL) */
@@ -941,7 +936,7 @@
 	fn = data_ind->u32Fn;
 	link_id =  (data_ind->sapi == GsmL1_Sapi_Sacch) ? LID_SACCH : LID_DEDIC;
 
-	process_meas_res(trx, chan_nr, fn, &data_ind->measParam);
+	process_meas_res(trx, chan_nr, &data_ind->measParam);
 
 	if (data_ind->measParam.fLinkQuality < btsb->min_qual_norm
 	 && data_ind->msgUnitParam.u8Size != 0) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib50c813c470bf6ea740fe6667431eaa1a23fdd8d
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>