diff options
author | Daniel Willmann <dwillmann@sysmocom.de> | 2014-08-07 17:32:01 +0200 |
---|---|---|
committer | Daniel Willmann <daniel@totalueberwachung.de> | 2014-08-08 14:15:24 +0200 |
commit | e2732e2f5981d8898364541926df219f7b285b92 (patch) | |
tree | 2fc6589f097e35632ab645397a3ab9922f22da8a | |
parent | f72fcfe2197677ac0252a76d63573929f786cd5f (diff) |
tbf: Make snd_ul_ud() and assemble_forward_llc() methods of UL TBF
They are only called for UL TBF.
Ticket: SYS#389
Sponsored by: On-Waves ehf
-rw-r--r-- | src/tbf.cpp | 4 | ||||
-rw-r--r-- | src/tbf.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tbf.cpp b/src/tbf.cpp index 22b8ce0e..b5bb123d 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -728,7 +728,7 @@ struct msgb *gprs_rlcmac_tbf::llc_dequeue(bssgp_bvc_ctx *bctx) * Store received block data in LLC message(s) and forward to SGSN * if complete. */ -int gprs_rlcmac_tbf::assemble_forward_llc(const gprs_rlc_data *_data) +int gprs_rlcmac_ul_tbf::assemble_forward_llc(const gprs_rlc_data *_data) { const uint8_t *data = _data->block; uint8_t len = _data->len; @@ -1749,7 +1749,7 @@ void gprs_rlcmac_ul_tbf::maybe_schedule_uplink_acknack(const rlc_ul_header *rh) } /* Send Uplink unit-data to SGSN. */ -int gprs_rlcmac_tbf::snd_ul_ud() +int gprs_rlcmac_ul_tbf::snd_ul_ud() { uint8_t qos_profile[3]; struct msgb *llc_pdu; @@ -118,12 +118,8 @@ struct gprs_rlcmac_tbf { /* TODO: add the gettimeofday as parameter */ struct msgb *llc_dequeue(bssgp_bvc_ctx *bctx); - /* TODO: extract LLC class? */ - int assemble_forward_llc(const gprs_rlc_data *data); - struct msgb *create_dl_ass(uint32_t fn); struct msgb *create_ul_ass(uint32_t fn); - int snd_ul_ud(); uint8_t tsc() const; @@ -339,6 +335,10 @@ struct gprs_rlcmac_ul_tbf : public gprs_rlcmac_tbf { /* blocks were acked */ int rcv_data_block_acknowledged(const uint8_t *data, size_t len, int8_t rssi); + /* TODO: extract LLC class? */ + int assemble_forward_llc(const gprs_rlc_data *data); + int snd_ul_ud(); + /* Please note that all variables here will be reset when changing * from WAIT RELEASE back to FLOW state (re-use of TBF). * All states that need reset must be in this struct, so this is why |