Move fc_* fields from BTS to PCU
Change-Id: I816d49e732d0fc7a3c9aa1f0e9a83b83d25e6a32
diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp
index 89edd2b..c1a7a7d 100644
--- a/src/gprs_bssgp_pcu.cpp
+++ b/src/gprs_bssgp_pcu.cpp
@@ -673,7 +673,7 @@
uint32_t leak_rate, uint32_t fallback)
{
uint32_t bucket_size = 0;
- uint16_t bucket_time = bts->fc_bucket_time;
+ uint16_t bucket_time = the_pcu->vty.fc_bucket_time;
if (bucket_time == 0)
bucket_time = bts->force_llc_lifetime;
@@ -811,10 +811,10 @@
max_cs_dl = max_coding_scheme_dl(bts);
- bucket_size = bts->fc_bvc_bucket_size;
- leak_rate = bts->fc_bvc_leak_rate;
- ms_bucket_size = bts->fc_ms_bucket_size;
- ms_leak_rate = bts->fc_ms_leak_rate;
+ bucket_size = the_pcu->vty.fc_bvc_bucket_size;
+ leak_rate = the_pcu->vty.fc_bvc_leak_rate;
+ ms_bucket_size = the_pcu->vty.fc_ms_bucket_size;
+ ms_leak_rate = the_pcu->vty.fc_ms_leak_rate;
/* FIXME: This calculation is mostly wrong. It should be done based on
currently established TBF (and whether the related (egprs)_ms_class
@@ -940,7 +940,7 @@
LOGP(DBSSGP, LOGL_DEBUG, "Sending flow control info on BVCI %d\n",
the_pcu->bssgp.bctx->bvci);
gprs_bssgp_tx_fc_bvc();
- osmo_timer_schedule(&the_pcu->bssgp.bvc_timer, the_pcu->bssgp.bts->fc_interval, 0);
+ osmo_timer_schedule(&the_pcu->bssgp.bvc_timer, the_pcu->vty.fc_interval, 0);
}
static int ns_create_nsvc(struct gprs_rlcmac_bts *bts,