diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-05-20 12:06:46 +0200 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-05-27 13:29:59 +0200 |
| commit | 767193e20b4172dfb0e76ec63444115dc5ae8806 (patch) | |
| tree | db3cf75b01e916afa5ce994e239111c454113382 /src/tbf_dl.cpp | |
| parent | d1cb41bfd020eb9b94b17e5bcaa5be36bceccc12 (diff) | |
tbf: Remove the TLLI from the TBFs
Currently the TLLI is stored in each TBF. Since each MS is now
represented by a GprsMs object which takes care of TLLI updating,
and each TBF that has been associated with an TLLI also contains a
reference to a GprsMs object, per TBF TLLI handling is no longer
needed. Keeping all TBF m_tlli members up to date is complex and
doesn't currently work correctly in all circumstances.
This commit removes m_tlli and related members from the TBF class and
the tbf_by_tlli functions from the BTS class.
Ticket: #1674
Sponsored-by: On-Waves ehf
Diffstat (limited to 'src/tbf_dl.cpp')
| -rw-r--r-- | src/tbf_dl.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index d2720aed..605239a3 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -205,8 +205,6 @@ static int tbf_new_dl_assignment(struct gprs_rlcmac_bts *bts, bts->bts->llc_dropped_frame(); return -EBUSY; } - dl_tbf->m_tlli = tlli; - dl_tbf->m_tlli_valid = 1; dl_tbf->ta = ta; dl_tbf->update_ms(tlli, GPRS_RLCMAC_DL_TBF); @@ -316,7 +314,7 @@ struct msgb *gprs_rlcmac_dl_tbf::llc_dequeue(bssgp_bvc_ctx *bctx) frames = 0xff; if (octets > 0xffffff) octets = 0xffffff; - bssgp_tx_llc_discarded(bctx, m_tlli, frames, octets); + bssgp_tx_llc_discarded(bctx, tlli(), frames, octets); } return msg; @@ -796,15 +794,13 @@ void gprs_rlcmac_dl_tbf::reuse_tbf(const uint8_t *data, const uint16_t len) if (!new_tbf) { LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n"); - bssgp_tx_llc_discarded(gprs_bssgp_pcu_current_bctx(), m_tlli, + bssgp_tx_llc_discarded(gprs_bssgp_pcu_current_bctx(), tlli(), 1, len); bts->llc_dropped_frame(); return; } new_tbf->set_ms(ms()); - new_tbf->m_tlli = m_tlli; - new_tbf->m_tlli_valid = m_tlli_valid; new_tbf->ta = ta; new_tbf->assign_imsi(m_imsi); @@ -820,9 +816,6 @@ void gprs_rlcmac_dl_tbf::reuse_tbf(const uint8_t *data, const uint16_t len) m_wait_confirm = 0; m_window.reset(); - /* mark TLLI as invalid */ - m_tlli_valid = 0; - /* keep to flags */ state_flags &= GPRS_RLCMAC_FLAG_TO_MASK; state_flags &= ~(1 << GPRS_RLCMAC_FLAG_CCCH); |