diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-17 13:29:03 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-30 21:20:44 +0100 |
| commit | ae947fcf6710c72f55e1794fa4b3fa85aeeac720 (patch) | |
| tree | b5233e154ead0d98f15ffc16fd5c1bd9d65ae382 /src/gprs_rlcmac_sched.cpp | |
| parent | 344ff487563cf28866b7845da3c1f4f828c93fd5 (diff) | |
bts: Remove the global state from write_packet_uplink_ack
Similiar to the previous patches
Diffstat (limited to 'src/gprs_rlcmac_sched.cpp')
| -rw-r--r-- | src/gprs_rlcmac_sched.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 5456b990..de03e2ea 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -121,7 +121,8 @@ uint8_t sched_select_uplink(uint8_t trx, uint8_t ts, uint32_t fn, return usf; } -struct msgb *sched_select_ctrl_msg(uint8_t trx, uint8_t ts, uint32_t fn, +static struct msgb *sched_select_ctrl_msg(struct gprs_rlcmac_bts *bts, + uint8_t trx, uint8_t ts, uint32_t fn, uint8_t block_nr, struct gprs_rlcmac_pdch *pdch, struct gprs_rlcmac_tbf *ul_ass_tbf, struct gprs_rlcmac_tbf *dl_ass_tbf, @@ -143,7 +144,7 @@ struct msgb *sched_select_ctrl_msg(uint8_t trx, uint8_t ts, uint32_t fn, /* schedule PACKET UPLINK ACK (3rd priority) */ if (!msg && ul_ack_tbf) { tbf = ul_ack_tbf; - msg = gprs_rlcmac_send_uplink_ack(tbf, fn); + msg = gprs_rlcmac_send_uplink_ack(bts, tbf, fn); } /* any message */ if (msg) { @@ -270,7 +271,7 @@ int gprs_rlcmac_rcv_rts_block(uint8_t trx, uint8_t ts, uint16_t arfcn, usf = sched_select_uplink(trx, ts, fn, block_nr, pdch); /* Prio 1: select control message */ - msg = sched_select_ctrl_msg(trx, ts, fn, block_nr, pdch, ul_ass_tbf, + msg = sched_select_ctrl_msg(bts, trx, ts, fn, block_nr, pdch, ul_ass_tbf, dl_ass_tbf, ul_ack_tbf); /* Prio 2: select data message for downlink */ |