aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-10-27 13:35:30 +0100
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-10-30 21:24:13 +0100
commite1a075ab59299fb74ea563a05b7a677809fe5980 (patch)
treed9285a96601765f138bf9c0c1562916ef706ba8a /src
parent53a336f0e5c06104df9d396d36619f3b03ce0d98 (diff)
bts: Pass the Packet_Control_Acknowledgement_t into the recv method
Diffstat (limited to 'src')
-rw-r--r--src/bts.cpp6
-rw-r--r--src/bts.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bts.cpp b/src/bts.cpp
index 90f86cd5..892ddf1c 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -867,12 +867,12 @@ int gprs_rlcmac_pdch::rcv_data_block_acknowledged(uint8_t *data, uint8_t len, in
return 0;
}
-void gprs_rlcmac_pdch::rcv_control_ack(RlcMacUplink_t *ul_control_block, uint32_t fn)
+void gprs_rlcmac_pdch::rcv_control_ack(Packet_Control_Acknowledgement_t *packet, uint32_t fn)
{
struct gprs_rlcmac_tbf *tbf;
uint32_t tlli = 0;
- tlli = ul_control_block->u.Packet_Control_Acknowledgement.TLLI;
+ tlli = packet->TLLI;
tbf = bts()->tbf_by_poll_fn(fn, trx_no(), ts_no);
if (!tbf) {
LOGP(DRLCMAC, LOGL_NOTICE, "PACKET CONTROL ACK with "
@@ -1125,7 +1125,7 @@ int gprs_rlcmac_pdch::rcv_control_block(
LOGP(DRLCMAC, LOGL_DEBUG, "------------------------- RX : Uplink Control Block -------------------------\n");
switch (ul_control_block->u.MESSAGE_TYPE) {
case MT_PACKET_CONTROL_ACK:
- rcv_control_ack(ul_control_block, fn);
+ rcv_control_ack(&ul_control_block->u.Packet_Control_Acknowledgement, fn);
break;
case MT_PACKET_DOWNLINK_ACK_NACK:
rcv_control_dl_ack_nack(&ul_control_block->u.Packet_Downlink_Ack_Nack, fn);
diff --git a/src/bts.h b/src/bts.h
index 9d389908..334e0a22 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -81,7 +81,7 @@ private:
int rcv_data_block_acknowledged(uint8_t *data, uint8_t len, int8_t rssi);
int rcv_control_block(bitvec *rlc_block, uint32_t fn);
- void rcv_control_ack(RlcMacUplink_t *, uint32_t fn);
+ void rcv_control_ack(Packet_Control_Acknowledgement_t *, uint32_t fn);
void rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *, uint32_t fn);
void rcv_resource_request(Packet_Resource_Request_t *t, uint32_t fn);
void rcv_measurement_report(Packet_Measurement_Report_t *t, uint32_t fn);