bts: Remove global state from gprs_rlcmac_send_packet_downlink_assignment
diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h
index 192f279..07d2049 100644
--- a/src/gprs_rlcmac.h
+++ b/src/gprs_rlcmac.h
@@ -197,6 +197,7 @@
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 b95bf2d..eb6e21a 100644
--- a/src/gprs_rlcmac_data.cpp
+++ b/src/gprs_rlcmac_data.cpp
@@ -1587,8 +1587,6 @@
/* 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 @@
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 de03e2e..52ed23a 100644
--- a/src/gprs_rlcmac_sched.cpp
+++ b/src/gprs_rlcmac_sched.cpp
@@ -139,7 +139,7 @@
/* 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) {