<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20992">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Take into account BTS supported (M)CS values when retrieving the maximum<br><br>Change-Id: I2d3a8bbae2f9887400ce56d2f8303ea30abaecfa<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/gprs_bssgp_pcu.cpp<br>M src/gprs_ms.cpp<br>M src/pcu_l1_if.cpp<br>M src/pcu_vty.c<br>6 files changed, 168 insertions(+), 55 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.cpp b/src/bts.cpp</span><br><span>index 359f2d5..c2e3b9c 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -219,10 +219,10 @@</span><br><span> bts->cs_adj_enabled = 1;</span><br><span> bts->cs_adj_upper_limit = 33; /* Decrease CS if the error rate is above */</span><br><span> bts->cs_adj_lower_limit = 10; /* Increase CS if the error rate is below */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_cs_ul = MAX_GPRS_CS;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_cs_dl = MAX_GPRS_CS;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_mcs_ul = MAX_EDGE_MCS;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_mcs_dl = MAX_EDGE_MCS;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.max_cs_ul = MAX_GPRS_CS;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.max_cs_dl = MAX_GPRS_CS;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.max_mcs_ul = MAX_EDGE_MCS;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.max_mcs_dl = MAX_EDGE_MCS;</span><br><span> /* CS-1 to CS-4 */</span><br><span> bts->cs_lqual_ranges[0].low = -256;</span><br><span> bts->cs_lqual_ranges[0].high = 6;</span><br><span>@@ -320,6 +320,10 @@</span><br><span> BTS::BTS()</span><br><span> : m_cur_fn(0)</span><br><span> , m_cur_blk_fn(-1)</span><br><span style="color: hsl(120, 100%, 40%);">+ , m_max_cs_dl(MAX_GPRS_CS)</span><br><span style="color: hsl(120, 100%, 40%);">+ , m_max_cs_ul(MAX_GPRS_CS)</span><br><span style="color: hsl(120, 100%, 40%);">+ , m_max_mcs_dl(MAX_EDGE_MCS)</span><br><span style="color: hsl(120, 100%, 40%);">+ , m_max_mcs_ul(MAX_EDGE_MCS)</span><br><span> , m_pollController(*this)</span><br><span> , m_sba(*this)</span><br><span> , m_ms_store(this)</span><br><span>@@ -1072,6 +1076,53 @@</span><br><span> bitvec_free(immediate_assignment);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* return maximum DL CS supported by BTS and allowed by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t BTS::max_cs_dl(void) const</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return m_max_cs_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* return maximum UL CS supported by BTS and allowed by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t BTS::max_cs_ul(void) const</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return m_max_cs_ul;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* return maximum DL MCS supported by BTS and allowed by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t BTS::max_mcs_dl(void) const</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return m_max_mcs_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* return maximum UL MCS supported by BTS and allowed by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t BTS::max_mcs_ul(void) const</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return m_max_mcs_ul;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Set maximum DL CS supported by BTS and allowed by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+void BTS::set_max_cs_dl(uint8_t cs_dl)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ m_max_cs_dl = cs_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Set maximum UL CS supported by BTS and allowed by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+void BTS::set_max_cs_ul(uint8_t cs_ul)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ m_max_cs_ul = cs_ul;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Set maximum DL MCS supported by BTS and allowed by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+void BTS::set_max_mcs_dl(uint8_t mcs_dl)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ m_max_mcs_dl = mcs_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Set maximum UL MCS supported by BTS and allowed by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+void BTS::set_max_mcs_ul(uint8_t mcs_ul)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ m_max_mcs_ul = mcs_ul;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> GprsMs *BTS::ms_alloc(uint8_t ms_class, uint8_t egprs_ms_class)</span><br><span> {</span><br><span>@@ -1161,3 +1212,57 @@</span><br><span> if (slots & (1 << i))</span><br><span> pdch[i].unreserve(dir);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void bts_set_max_cs(struct gprs_rlcmac_bts *bts, uint8_t cs_dl, uint8_t cs_ul)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.max_cs_dl = cs_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+ cs_dl = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = bts->vty.max_cs_dl - 1; i >= 0; i--) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->cs_mask & (1 << i)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ cs_dl = i + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.max_cs_ul = cs_ul;</span><br><span style="color: hsl(120, 100%, 40%);">+ cs_ul = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = bts->vty.max_cs_ul - 1; i >= 0; i--) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->cs_mask & (1 << i)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ cs_ul = i + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMAC, LOGL_DEBUG, "New max CS: DL=%u UL=%u\n", cs_dl, cs_ul);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->bts->set_max_cs_dl(cs_dl);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->bts->set_max_cs_ul(cs_ul);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void bts_set_max_mcs(struct gprs_rlcmac_bts *bts, uint8_t mcs_dl, uint8_t mcs_ul)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.max_mcs_dl = mcs_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs_dl = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = bts->vty.max_mcs_dl - 1; i >= 0; i--) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->mcs_mask & (1 << i)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs_dl = i + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.max_mcs_ul = mcs_ul;</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs_ul = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = bts->vty.max_mcs_ul - 1; i >= 0; i--) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->mcs_mask & (1 << i)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs_ul = i + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMAC, LOGL_DEBUG, "New max MCS: DL=%u UL=%u\n", mcs_dl, mcs_ul);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->bts->set_max_mcs_dl(mcs_dl);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->bts->set_max_mcs_ul(mcs_ul);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 7335483..8d7f6ca 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -114,8 +114,10 @@</span><br><span> uint16_t mcs_mask; /* Allowed MCS mask from BTS */</span><br><span> uint8_t initial_cs_dl, initial_cs_ul;</span><br><span> uint8_t initial_mcs_dl, initial_mcs_ul;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t max_cs_dl, max_cs_ul;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t max_mcs_dl, max_mcs_ul;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct { /* Config Values set by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max_cs_dl, max_cs_ul;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max_mcs_dl, max_mcs_ul;</span><br><span style="color: hsl(120, 100%, 40%);">+ } vty;</span><br><span> uint8_t force_cs; /* 0=use from BTS 1=use from VTY */</span><br><span> uint16_t force_llc_lifetime; /* overrides lifetime from SGSN */</span><br><span> uint32_t llc_discard_csec;</span><br><span>@@ -329,6 +331,15 @@</span><br><span> </span><br><span> void snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, uint16_t pgroup);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max_cs_dl(void) const;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max_cs_ul(void) const;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max_mcs_dl(void) const;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max_mcs_ul(void) const;</span><br><span style="color: hsl(120, 100%, 40%);">+ void set_max_cs_dl(uint8_t cs_dl);</span><br><span style="color: hsl(120, 100%, 40%);">+ void set_max_cs_ul(uint8_t cs_ul);</span><br><span style="color: hsl(120, 100%, 40%);">+ void set_max_mcs_dl(uint8_t mcs_dl);</span><br><span style="color: hsl(120, 100%, 40%);">+ void set_max_mcs_ul(uint8_t mcs_ul);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> GprsMsStorage &ms_store();</span><br><span> GprsMs *ms_by_tlli(uint32_t tlli, uint32_t old_tlli = 0);</span><br><span> GprsMs *ms_by_imsi(const char *imsi);</span><br><span>@@ -358,6 +369,8 @@</span><br><span> int m_cur_fn;</span><br><span> int m_cur_blk_fn;</span><br><span> struct gprs_rlcmac_bts m_bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t m_max_cs_dl, m_max_cs_ul;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t m_max_mcs_dl, m_max_mcs_ul;</span><br><span> PollController m_pollController;</span><br><span> SBAController m_sba;</span><br><span> struct rate_ctr_group *m_ratectrs;</span><br><span>@@ -442,6 +455,8 @@</span><br><span> struct gprs_rlcmac_bts *bts_main_data();</span><br><span> struct rate_ctr_group *bts_main_data_stats();</span><br><span> struct osmo_stat_item_group *bts_main_data_stat_items();</span><br><span style="color: hsl(120, 100%, 40%);">+ void bts_set_max_cs(struct gprs_rlcmac_bts *bts, uint8_t cs_dl, uint8_t cs_ul);</span><br><span style="color: hsl(120, 100%, 40%);">+ void bts_set_max_mcs(struct gprs_rlcmac_bts *bts, uint8_t mcs_dl, uint8_t mcs_ul);</span><br><span> #ifdef __cplusplus</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp</span><br><span>index 4b5582d..f87681c 100644</span><br><span>--- a/src/gprs_bssgp_pcu.cpp</span><br><span>+++ b/src/gprs_bssgp_pcu.cpp</span><br><span>@@ -753,8 +753,8 @@</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (bts->max_mcs_dl) {</span><br><span style="color: hsl(0, 100%, 40%);">- num = bts->max_mcs_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (bts->bts->max_mcs_dl()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ num = bts->bts->max_mcs_dl();</span><br><span> } else {</span><br><span> num = 9;</span><br><span> }</span><br><span>@@ -774,8 +774,8 @@</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (bts->max_cs_dl) {</span><br><span style="color: hsl(0, 100%, 40%);">- num = bts->max_cs_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (bts->bts->max_cs_dl()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ num = bts->bts->max_cs_dl();</span><br><span> }</span><br><span> </span><br><span> if (!num)</span><br><span>diff --git a/src/gprs_ms.cpp b/src/gprs_ms.cpp</span><br><span>index 9576c0d..b295686 100644</span><br><span>--- a/src/gprs_ms.cpp</span><br><span>+++ b/src/gprs_ms.cpp</span><br><span>@@ -541,9 +541,8 @@</span><br><span> </span><br><span> m_egprs_ms_class = ms_class_;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- const struct gprs_rlcmac_bts *bts = m_bts->bts_data();</span><br><span style="color: hsl(0, 100%, 40%);">- if (mcs_is_edge_gmsk(mcs_get_egprs_by_num(bts->max_mcs_ul)) &&</span><br><span style="color: hsl(0, 100%, 40%);">- mcs_is_edge_gmsk(mcs_get_egprs_by_num(bts->max_mcs_dl)) &&</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mcs_is_edge_gmsk(mcs_get_egprs_by_num(m_bts->max_mcs_ul())) &&</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs_is_edge_gmsk(mcs_get_egprs_by_num(m_bts->max_mcs_dl())) &&</span><br><span> mode() != EGPRS)</span><br><span> {</span><br><span> set_mode(EGPRS_GMSK);</span><br><span>@@ -609,26 +608,23 @@</span><br><span> </span><br><span> enum CodingScheme GprsMs::max_cs_ul() const</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts_data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> OSMO_ASSERT(m_bts != NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- bts_data = m_bts->bts_data();</span><br><span> </span><br><span> if (mcs_is_gprs(m_current_cs_ul)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts_data->max_cs_ul) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!m_bts->max_cs_ul()) {</span><br><span> return CS4;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_get_gprs_by_num(bts_data->max_cs_ul);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_get_gprs_by_num(m_bts->max_cs_ul());</span><br><span> }</span><br><span> </span><br><span> if (!mcs_is_edge(m_current_cs_ul))</span><br><span> return UNKNOWN;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts_data->max_mcs_ul)</span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_get_egprs_by_num(bts_data->max_mcs_ul);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (bts_data->max_cs_ul)</span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_get_gprs_by_num(bts_data->max_cs_ul);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (m_bts->max_mcs_ul())</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_get_egprs_by_num(m_bts->max_mcs_ul());</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (m_bts->max_cs_ul())</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_get_gprs_by_num(m_bts->max_cs_ul());</span><br><span> </span><br><span> return MCS4;</span><br><span> }</span><br><span>@@ -640,26 +636,23 @@</span><br><span> </span><br><span> enum CodingScheme GprsMs::max_cs_dl() const</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts_data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> OSMO_ASSERT(m_bts != NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- bts_data = m_bts->bts_data();</span><br><span> </span><br><span> if (mcs_is_gprs(m_current_cs_dl)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts_data->max_cs_dl) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!m_bts->max_cs_dl()) {</span><br><span> return CS4;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_get_gprs_by_num(bts_data->max_cs_dl);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_get_gprs_by_num(m_bts->max_cs_dl());</span><br><span> }</span><br><span> </span><br><span> if (!mcs_is_edge(m_current_cs_dl))</span><br><span> return UNKNOWN;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts_data->max_mcs_dl)</span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_get_egprs_by_num(bts_data->max_mcs_dl);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (bts_data->max_cs_dl)</span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_get_gprs_by_num(bts_data->max_cs_dl);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (m_bts->max_mcs_dl())</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_get_egprs_by_num(m_bts->max_mcs_dl());</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (m_bts->max_cs_dl())</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_get_gprs_by_num(m_bts->max_cs_dl());</span><br><span> </span><br><span> return MCS4;</span><br><span> }</span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index 7e51763..4f96567 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -621,6 +621,7 @@</span><br><span> if (allowed)</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " Use CS%d\n", i + 1);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_set_max_cs(bts, bts->vty.max_cs_dl, bts->vty.max_cs_ul); /* recalc max CS values */</span><br><span> </span><br><span> bts->mcs_mask = 0;</span><br><span> for (i = 0; i < 9; i++) {</span><br><span>@@ -629,6 +630,7 @@</span><br><span> if (allowed)</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " Use MCS%d\n", i + 1);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_set_max_mcs(bts, bts->vty.max_mcs_dl, bts->vty.max_mcs_ul); /* recalc max MCS values */</span><br><span> </span><br><span> LOGP(DL1IF, LOGL_DEBUG, " initial_cs=%d\n", info_ind->initial_cs);</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " initial_mcs=%d\n", info_ind->initial_mcs);</span><br><span>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index 6dfcdf5..bd83544 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -133,13 +133,13 @@</span><br><span> vty_out(vty, " cs %d %d%s", bts->initial_cs_dl,</span><br><span> bts->initial_cs_ul, VTY_NEWLINE);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->max_cs_dl && bts->max_cs_ul) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->max_cs_ul == bts->max_cs_dl)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " cs max %d%s", bts->max_cs_dl,</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->vty.max_cs_dl && bts->vty.max_cs_ul) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->vty.max_cs_ul == bts->vty.max_cs_dl)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " cs max %d%s", bts->vty.max_cs_dl,</span><br><span> VTY_NEWLINE);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " cs max %d %d%s", bts->max_cs_dl,</span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_cs_ul, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " cs max %d %d%s", bts->vty.max_cs_dl,</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.max_cs_ul, VTY_NEWLINE);</span><br><span> }</span><br><span> if (bts->cs_adj_enabled)</span><br><span> vty_out(vty, " cs threshold %d %d%s",</span><br><span>@@ -191,13 +191,13 @@</span><br><span> bts->initial_mcs_ul, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->max_mcs_dl && bts->max_mcs_ul) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->max_mcs_ul == bts->max_mcs_dl)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " mcs max %d%s", bts->max_mcs_dl,</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->vty.max_mcs_dl && bts->vty.max_mcs_ul) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->vty.max_mcs_ul == bts->vty.max_mcs_dl)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " mcs max %d%s", bts->vty.max_mcs_dl,</span><br><span> VTY_NEWLINE);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " mcs max %d %d%s", bts->max_mcs_dl,</span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_mcs_ul, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " mcs max %d %d%s", bts->vty.max_mcs_dl,</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->vty.max_mcs_ul, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> vty_out(vty, " window-size %d %d%s", bts->ws_base, bts->ws_pdch,</span><br><span>@@ -494,14 +494,15 @@</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cs = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t cs_dl = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t cs_ul;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_cs_dl = cs;</span><br><span> if (argc > 1)</span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_cs_ul = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ cs_ul = atoi(argv[1]);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_cs_ul = cs;</span><br><span style="color: hsl(120, 100%, 40%);">+ cs_ul = cs_dl;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ bts_set_max_cs(bts, cs_dl, cs_ul);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -513,9 +514,7 @@</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_cs_dl = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_cs_ul = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_set_max_cs(bts, 0, 0);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -564,14 +563,15 @@</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t mcs = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t mcs_dl = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t mcs_ul;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_mcs_dl = mcs;</span><br><span> if (argc > 1)</span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_mcs_ul = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs_ul = atoi(argv[1]);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_mcs_ul = mcs;</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs_ul = mcs_dl;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ bts_set_max_mcs(bts, mcs_dl, mcs_ul);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -583,9 +583,7 @@</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_mcs_dl = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->max_mcs_ul = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_set_max_mcs(bts, 0, 0);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20992">change 20992</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/20992"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2d3a8bbae2f9887400ce56d2f8303ea30abaecfa </div>
<div style="display:none"> Gerrit-Change-Number: 20992 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>