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
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 22b8ce0..b5bb123 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -728,7 +728,7 @@
* 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 @@
}
/* 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;
diff --git a/src/tbf.h b/src/tbf.h
index 23f8a7b..b287e77 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -118,12 +118,8 @@
/* 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 @@
/* 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