diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-17 15:23:49 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-30 21:20:45 +0100 |
| commit | 8d7a632eefa33b84bf25de95c99bebd47860f3e9 (patch) | |
| tree | f93d4671f03b36af72e9b27b7f57f4cc18a0b913 | |
| parent | 4ffc260869c5557949d44b5d13286ce205b31b66 (diff) | |
bts: Remove global state frm gprs_rlcmac_rcv_control_block
| -rw-r--r-- | src/gprs_rlcmac.cpp | 2 | ||||
| -rw-r--r-- | src/gprs_rlcmac.h | 3 | ||||
| -rw-r--r-- | src/gprs_rlcmac_data.cpp | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp index 885ef2e0..419470b6 100644 --- a/src/gprs_rlcmac.cpp +++ b/src/gprs_rlcmac.cpp @@ -263,7 +263,7 @@ int gprs_rlcmac_rcv_block(struct gprs_rlcmac_bts *bts, if (!block) return -ENOMEM; bitvec_unpack(block, data); - rc = gprs_rlcmac_rcv_control_block(block, trx, ts, fn); + rc = gprs_rlcmac_rcv_control_block(bts, block, trx, ts, fn); bitvec_free(block); break; case GPRS_RLCMAC_CONTROL_BLOCK_OPT: diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index c08b8801..0fcbad62 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -190,7 +190,8 @@ int gprs_rlcmac_sba_timeout(struct gprs_rlcmac_sba *sba); int gprs_rlcmac_rcv_rach(struct gprs_rlcmac_bts *bts, uint8_t ra, uint32_t Fn, int16_t qta); -int gprs_rlcmac_rcv_control_block(bitvec *rlc_block, uint8_t trx, uint8_t ts, +int gprs_rlcmac_rcv_control_block(struct gprs_rlcmac_bts *bts, + bitvec *rlc_block, uint8_t trx, uint8_t ts, uint32_t fn); struct msgb *gprs_rlcmac_send_packet_uplink_assignment( diff --git a/src/gprs_rlcmac_data.cpp b/src/gprs_rlcmac_data.cpp index dff64ec5..06be8b7f 100644 --- a/src/gprs_rlcmac_data.cpp +++ b/src/gprs_rlcmac_data.cpp @@ -212,14 +212,14 @@ static uint8_t get_ms_class_by_capability(MS_Radio_Access_capability_t *cap) } /* Received Uplink RLC control block. */ -int gprs_rlcmac_rcv_control_block(bitvec *rlc_block, uint8_t trx, uint8_t ts, +int gprs_rlcmac_rcv_control_block(struct gprs_rlcmac_bts *bts, + bitvec *rlc_block, uint8_t trx, uint8_t ts, uint32_t fn) { int8_t tfi = 0; /* must be signed */ uint32_t tlli = 0; struct gprs_rlcmac_tbf *tbf; struct gprs_rlcmac_sba *sba; - struct gprs_rlcmac_bts *bts = gprs_rlcmac_bts; int rc; RlcMacUplink_t * ul_control_block = (RlcMacUplink_t *)talloc_zero(tall_pcu_ctx, RlcMacUplink_t); |