diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-07-03 14:03:33 +0200 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-07-03 15:58:45 +0200 |
| commit | e0c734dcfe6501198e56bd3a89ad03ce5cfd5129 (patch) | |
| tree | 705e5bb98b53444874cec92dc50d477350f34dd7 /src/tbf.cpp | |
| parent | 07111668d4b4bfe44c02077b29ed7d3cb8415134 (diff) | |
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
Diffstat (limited to 'src/tbf.cpp')
| -rw-r--r-- | src/tbf.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/tbf.cpp b/src/tbf.cpp index 006f66e0..1d72ffcd 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -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"); |