cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity

Revert "tbf: Add GprsMs* argument to update() and use it in reuse_tbf" 

This reverts commit 2272a83a13b57ea7e99fe96ac76e4ad892e19e90.

The modification is no longer needed, since the call to update has
been removed from reuse_tbf().

Conflicts:
	src/tbf_dl.cpp

Sponsored-by: On-Waves ehf
This commit is contained in:
Jacob Erlbeck 2015-07-03 14:03:33 +02:00
parent 07111668d4
commit e0c734dcfe
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tbf.cpp
View File

@ -263,24 +263,18 @@ void tbf_free(struct gprs_rlcmac_tbf *tbf)
talloc_free(tbf);
}
int gprs_rlcmac_tbf::update(GprsMs *ms_)
int gprs_rlcmac_tbf::update()
{
struct gprs_rlcmac_bts *bts_data = bts->bts_data();
int rc = -EINVAL;
int rc;
LOGP(DRLCMAC, LOGL_DEBUG, "********** TBF update **********\n");
if (direction != GPRS_RLCMAC_DL_TBF)
return -EINVAL;
if (!ms_)
ms_ = ms();
if (!ms_)
return -EINVAL;
tbf_unlink_pdch(this);
rc = bts_data->alloc_algorithm(bts_data, ms_, this, bts_data->alloc_algorithm_curst, 0);
rc = bts_data->alloc_algorithm(bts_data, ms(), this, bts_data->alloc_algorithm_curst, 0);
/* if no resource */
if (rc < 0) {
LOGP(DRLCMAC, LOGL_ERROR, "No resource after update???\n");

2
src/tbf.h
View File

@ -131,7 +131,7 @@ struct gprs_rlcmac_tbf {
int rlcmac_diag();
int update(GprsMs *ms = NULL);
int update();
void handle_timeout();
void stop_timer();
void stop_t3191();