diff options
| author | Philipp Maier <pmaier@sysmocom.de> | 2017-06-26 12:18:28 +0200 |
|---|---|---|
| committer | dexter <pmaier@sysmocom.de> | 2017-07-04 11:53:12 +0000 |
| commit | 3902e4d9c40faadd0bf039d54b75318326a9718e (patch) | |
| tree | 78b1809b1767502026de3cd35242dac33f7e342f | |
| parent | 9b97d0f683bccd71b035ece1a6caebfc0f26d1b1 (diff) | |
Revert "osmo-bts-sysmo: Include frame number in MEAS IND"
This reverts commit 3f97e4b1fcdc788345ab7740bd4fb8a3d73f5526.
Change-Id: Ib50c813c470bf6ea740fe6667431eaa1a23fdd8d
| -rw-r--r-- | src/osmo-bts-sysmo/l1_if.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 837fc5c3..05805b89 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -897,7 +897,7 @@ static void dump_meas_res(int ll, GsmL1_MeasParam_t *m) } 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)); @@ -909,11 +909,6 @@ static int process_meas_res(struct gsm_bts_trx *trx, uint8_t chan_nr, 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) */ return l1sap_up(trx, &l1sap); @@ -941,7 +936,7 @@ static int handle_ph_data_ind(struct femtol1_hdl *fl1, GsmL1_PhDataInd_t *data_i 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) { |