diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-17 15:32:37 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-30 21:20:45 +0100 |
| commit | d507ce6b854b4cc61560c50ad7d044e689bd6b40 (patch) | |
| tree | a9e4d328b971685c9ee8c9a898bd2700f74f5f67 /src | |
| parent | 8d7a632eefa33b84bf25de95c99bebd47860f3e9 (diff) | |
bts: Remove global state from gprs_rlcmac_send_packet_uplink_assignment
This was the last method of gprs_rlcmac_data.cpp to access the
gprs_rlcmac_bts variable.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gprs_rlcmac.h | 1 | ||||
| -rw-r--r-- | src/gprs_rlcmac_data.cpp | 2 | ||||
| -rw-r--r-- | src/gprs_rlcmac_sched.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 0fcbad62..a26127b9 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -195,6 +195,7 @@ int gprs_rlcmac_rcv_control_block(struct gprs_rlcmac_bts *bts, uint32_t fn); struct msgb *gprs_rlcmac_send_packet_uplink_assignment( + struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, uint32_t fn); struct msgb *gprs_rlcmac_send_packet_downlink_assignment( diff --git a/src/gprs_rlcmac_data.cpp b/src/gprs_rlcmac_data.cpp index 06be8b7f..af320c79 100644 --- a/src/gprs_rlcmac_data.cpp +++ b/src/gprs_rlcmac_data.cpp @@ -955,9 +955,9 @@ int gprs_rlcmac_rcv_data_block_acknowledged(struct gprs_rlcmac_bts *bts, } struct msgb *gprs_rlcmac_send_packet_uplink_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; diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 2dfc4868..82e587a2 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -134,7 +134,7 @@ static struct msgb *sched_select_ctrl_msg(struct gprs_rlcmac_bts *bts, /* schedule PACKET UPLINK ASSIGNMENT (1st priority) */ if (ul_ass_tbf) { tbf = ul_ass_tbf; - msg = gprs_rlcmac_send_packet_uplink_assignment(tbf, fn); + msg = gprs_rlcmac_send_packet_uplink_assignment(bts, tbf, fn); } /* schedule PACKET DOWNLINK ASSIGNMENT (2nd priotiry) */ if (!msg && dl_ass_tbf) { |