<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20928">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
lynxis lazus: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Enable egprs support through PCUIF from BTS/BSC<br><br>This VTY command was added due to EGPRS being introduced later as an<br>experimental feature. It's no longer needed and causes more problems<br>than goodness (since people sometimes forgets to enable it).<br><br>Let's rather simply enable EGPRS support based on what BTS/BSC requests<br>over PCUIF.<br><br>Related: OS#4544<br>Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0<br>---<br>M src/pcu_l1_if.cpp<br>M src/pcu_vty.c<br>2 files changed, 14 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index 4f96567..127029b 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -623,12 +623,15 @@</span><br><span> }</span><br><span> 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 style="color: hsl(120, 100%, 40%);">+ bts->egprs_enabled = false;</span><br><span> bts->mcs_mask = 0;</span><br><span> for (i = 0; i < 9; i++) {</span><br><span> uint8_t allowed = !!(info_ind->flags & (PCU_IF_FLAG_MCS1 << i));</span><br><span> bts->mcs_mask |= allowed << i;</span><br><span style="color: hsl(0, 100%, 40%);">- if (allowed)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (allowed) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->egprs_enabled = true;</span><br><span> LOGP(DL1IF, LOGL_DEBUG, " Use MCS%d\n", i + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> 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>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index bd83544..5e5dfbe 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -108,9 +108,6 @@</span><br><span> unsigned int i;</span><br><span> </span><br><span> vty_out(vty, "pcu%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->egprs_enabled)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " egprs only%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> vty_out(vty, " flow-control-interval %d%s", bts->fc_interval,</span><br><span> VTY_NEWLINE);</span><br><span> if (bts->fc_bvc_bucket_size)</span><br><span>@@ -273,29 +270,21 @@</span><br><span> </span><br><span> #define EGPRS_STR "EGPRS configuration\n"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN_USRATTR(cfg_pcu_egprs,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_pcu_egprs_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- X(PCU_VTY_ATTR_NEW_TBF),</span><br><span style="color: hsl(0, 100%, 40%);">- "egprs only",</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_STR "Use EGPRS and disable plain GPRS\n")</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(cfg_pcu_egprs,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_pcu_egprs_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "egprs only",</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_STR "Use EGPRS and disable plain GPRS\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bts->egprs_enabled = true;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out (vty, "'egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN_USRATTR(cfg_pcu_no_egprs,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_pcu_no_egprs_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- X(PCU_VTY_ATTR_NEW_TBF),</span><br><span style="color: hsl(0, 100%, 40%);">- "no egprs",</span><br><span style="color: hsl(0, 100%, 40%);">- NO_STR EGPRS_STR)</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(cfg_pcu_no_egprs,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_pcu_no_egprs_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no egprs",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR EGPRS_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bts->egprs_enabled = false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out (vty, "'no egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE);</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/+/20928">change 20928</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/+/20928"/><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: Ic80970a136361584da9c912252a07e7c3c9d85d0 </div>
<div style="display:none"> Gerrit-Change-Number: 20928 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </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-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>