diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-17 13:48:11 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-30 21:20:45 +0100 |
| commit | 9f521cd4af46f5cc43e43c518c6a1b7e62f474ab (patch) | |
| tree | 206d3fa0981ff34f65c78b779d72d5f7400f99c2 /src | |
| parent | b0250ebeac1d1a20c0448a81f3609ddf3ec7517d (diff) | |
bts: Remove global state from gprs_rlcmac_send_packet_downlink_assignment
Diffstat (limited to 'src')
| -rw-r--r-- | src/gprs_rlcmac.h | 1 | ||||
| -rw-r--r-- | src/gprs_rlcmac_data.cpp | 4 | ||||
| -rw-r--r-- | src/gprs_rlcmac_sched.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 192f279e..07d20499 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -197,6 +197,7 @@ struct msgb *gprs_rlcmac_send_packet_uplink_assignment( struct gprs_rlcmac_tbf *tbf, uint32_t fn); struct msgb *gprs_rlcmac_send_packet_downlink_assignment( + struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, uint32_t fn); void gprs_rlcmac_trigger_downlink_assignment(struct gprs_rlcmac_bts *bts, diff --git a/src/gprs_rlcmac_data.cpp b/src/gprs_rlcmac_data.cpp index b95bf2d4..eb6e21ab 100644 --- a/src/gprs_rlcmac_data.cpp +++ b/src/gprs_rlcmac_data.cpp @@ -1587,8 +1587,6 @@ int gprs_rlcmac_downlink_ack(struct gprs_rlcmac_bts *bts, /* check for LLC PDU in the LLC Queue */ msg = llc_dequeue(tbf); if (!msg) { - struct gprs_rlcmac_bts *bts = gprs_rlcmac_bts; - /* no message, start T3193, change state to RELEASE */ LOGP(DRLCMACDL, LOGL_DEBUG, "- No new message, so we " "release.\n"); @@ -1620,9 +1618,9 @@ int gprs_rlcmac_downlink_ack(struct gprs_rlcmac_bts *bts, struct msgb *gprs_rlcmac_send_packet_downlink_assignment( + struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, uint32_t fn) { - struct gprs_rlcmac_bts *bts = gprs_rlcmac_bts; struct msgb *msg; struct gprs_rlcmac_tbf *new_tbf; int poll_ass_dl = POLLING_ASSIGNMENT_DL; diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index de03e2ea..52ed23a2 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -139,7 +139,7 @@ static struct msgb *sched_select_ctrl_msg(struct gprs_rlcmac_bts *bts, /* schedule PACKET DOWNLINK ASSIGNMENT (2nd priotiry) */ if (!msg && dl_ass_tbf) { tbf = dl_ass_tbf; - msg = gprs_rlcmac_send_packet_downlink_assignment(tbf, fn); + msg = gprs_rlcmac_send_packet_downlink_assignment(bts, tbf, fn); } /* schedule PACKET UPLINK ACK (3rd priority) */ if (!msg && ul_ack_tbf) { |