bts: Work with the Packet_Measurement_Report_t
diff --git a/src/bts.cpp b/src/bts.cpp
index b9dbaf8..638c7f0 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -1097,7 +1097,7 @@
LOGP(DRLCMAC, LOGL_ERROR, "RX: [PCU <- BTS] %s TFI: %u TLLI: 0x%08x FIXME: Packet resource request\n", (tbf->direction == GPRS_RLCMAC_UL_TBF) ? "UL" : "DL", tbf->tfi, tbf->tlli);
}
-void gprs_rlcmac_pdch::rcv_measurement_report(RlcMacUplink_t *ul_control_block, uint32_t fn)
+void gprs_rlcmac_pdch::rcv_measurement_report(Packet_Measurement_Report_t *report, uint32_t fn)
{
struct gprs_rlcmac_sba *sba;
@@ -1108,10 +1108,10 @@
"block, but there is no resource request "
"scheduled!\n");
} else {
- bts()->timing_advance()->remember(ul_control_block->u.Packet_Measurement_Report.TLLI, sba->ta);
+ bts()->timing_advance()->remember(report->TLLI, sba->ta);
bts()->sba()->free_sba(sba);
}
- gprs_rlcmac_meas_rep(&ul_control_block->u.Packet_Measurement_Report);
+ gprs_rlcmac_meas_rep(report);
}
/* Received Uplink RLC control block. */
@@ -1134,7 +1134,7 @@
rcv_resource_request(ul_control_block, fn);
break;
case MT_PACKET_MEASUREMENT_REPORT:
- rcv_measurement_report(ul_control_block, fn);
+ rcv_measurement_report(&ul_control_block->u.Packet_Measurement_Report, fn);
break;
case MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK:
/* ignoring it. change the SI to not force sending these? */
diff --git a/src/bts.h b/src/bts.h
index f15e711..71eff30 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -84,7 +84,7 @@
void rcv_control_ack(RlcMacUplink_t *, uint32_t fn);
void rcv_control_dl_ack_nack(RlcMacUplink_t *, uint32_t fn);
void rcv_resource_request(RlcMacUplink_t *t, uint32_t fn);
- void rcv_measurement_report(RlcMacUplink_t *t, uint32_t fn);
+ void rcv_measurement_report(Packet_Measurement_Report_t *t, uint32_t fn);
#endif
};