<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24389">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[VAMOS] common/oml: generalize checking BTS_FEAT_MULTI_TSC<br><br>Change-Id: Iaa5aced70e166963106c27ebdb09adaae22daea4<br>Related: SYS#4895, OS#4941<br>---<br>M src/common/oml.c<br>M src/osmo-bts-lc15/oml.c<br>M src/osmo-bts-oc2g/oml.c<br>M src/osmo-bts-sysmo/oml.c<br>4 files changed, 7 insertions(+), 44 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index 0a502c1..7bf89c5 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -962,6 +962,13 @@</span><br><span> /* 9.4.60 TSC */</span><br><span> if (TLVP_PRES_LEN(&tp, NM_ATT_TSC, 1)) {</span><br><span> ts->tsc_oml = ts->tsc = *TLVP_VAL(&tp, NM_ATT_TSC);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->tsc != BTS_TSC(bts) &&</span><br><span style="color: hsl(120, 100%, 40%);">+ !osmo_bts_has_feature(bts->features, BTS_FEAT_MULTI_TSC)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DOML, LOGL_ERROR, foh, "SET CHAN ATTR: this BTS model does not "</span><br><span style="color: hsl(120, 100%, 40%);">+ "support TSC %u != BSIC-BCC %u\n", ts->tsc, BTS_TSC(bts));</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(tp_merged);</span><br><span style="color: hsl(120, 100%, 40%);">+ return oml_fom_ack_nack(msg, NM_NACK_PARAM_RANGE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else {</span><br><span> /* If there is no TSC specified, use the BCC */</span><br><span> ts->tsc_oml = ts->tsc = BTS_TSC(bts);</span><br><span>diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c</span><br><span>index 3010fe7..acce1d4 100644</span><br><span>--- a/src/osmo-bts-lc15/oml.c</span><br><span>+++ b/src/osmo-bts-lc15/oml.c</span><br><span>@@ -1827,21 +1827,6 @@</span><br><span> void *obj)</span><br><span> {</span><br><span> /* FIXME: more checks if the attributes are valid */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (msg_type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case NM_MT_SET_CHAN_ATTR:</span><br><span style="color: hsl(0, 100%, 40%);">- /* our L1 only supports one global TSC for all channels</span><br><span style="color: hsl(0, 100%, 40%);">- * one one TRX, so we need to make sure not to activate</span><br><span style="color: hsl(0, 100%, 40%);">- * channels with a different TSC!! */</span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRESENT(new_attr, NM_ATT_TSC) &&</span><br><span style="color: hsl(0, 100%, 40%);">- TLVP_LEN(new_attr, NM_ATT_TSC) >= 1 &&</span><br><span style="color: hsl(0, 100%, 40%);">- *TLVP_VAL(new_attr, NM_ATT_TSC) != BTS_TSC(bts)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_ERROR, "Channel TSC %u != BSIC-TSC %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- *TLVP_VAL(new_attr, NM_ATT_TSC), BTS_TSC(bts));</span><br><span style="color: hsl(0, 100%, 40%);">- return -NM_NACK_PARAM_RANGE;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c</span><br><span>index 151b92e..5646cfb 100644</span><br><span>--- a/src/osmo-bts-oc2g/oml.c</span><br><span>+++ b/src/osmo-bts-oc2g/oml.c</span><br><span>@@ -1836,21 +1836,6 @@</span><br><span> void *obj)</span><br><span> {</span><br><span> /* FIXME: more checks if the attributes are valid */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (msg_type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case NM_MT_SET_CHAN_ATTR:</span><br><span style="color: hsl(0, 100%, 40%);">- /* our L1 only supports one global TSC for all channels</span><br><span style="color: hsl(0, 100%, 40%);">- * one one TRX, so we need to make sure not to activate</span><br><span style="color: hsl(0, 100%, 40%);">- * channels with a different TSC!! */</span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRESENT(new_attr, NM_ATT_TSC) &&</span><br><span style="color: hsl(0, 100%, 40%);">- TLVP_LEN(new_attr, NM_ATT_TSC) >= 1 &&</span><br><span style="color: hsl(0, 100%, 40%);">- *TLVP_VAL(new_attr, NM_ATT_TSC) != BTS_TSC(bts)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_ERROR, "Channel TSC %u != BSIC-TSC %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- *TLVP_VAL(new_attr, NM_ATT_TSC), BTS_TSC(bts));</span><br><span style="color: hsl(0, 100%, 40%);">- return -NM_NACK_PARAM_RANGE;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c</span><br><span>index 25c5651..818d82b 100644</span><br><span>--- a/src/osmo-bts-sysmo/oml.c</span><br><span>+++ b/src/osmo-bts-sysmo/oml.c</span><br><span>@@ -1741,20 +1741,6 @@</span><br><span> void *obj)</span><br><span> {</span><br><span> /* FIXME: more checks if the attributes are valid */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (msg_type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case NM_MT_SET_CHAN_ATTR:</span><br><span style="color: hsl(0, 100%, 40%);">- /* our L1 only supports one global TSC for all channels</span><br><span style="color: hsl(0, 100%, 40%);">- * one one TRX, so we need to make sure not to activate</span><br><span style="color: hsl(0, 100%, 40%);">- * channels with a different TSC!! */</span><br><span style="color: hsl(0, 100%, 40%);">- if (TLVP_PRES_LEN(new_attr, NM_ATT_TSC, 1) &&</span><br><span style="color: hsl(0, 100%, 40%);">- *TLVP_VAL(new_attr, NM_ATT_TSC) != BTS_TSC(bts)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DOML, LOGL_ERROR, "Channel TSC %u != BSIC-TSC %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- *TLVP_VAL(new_attr, NM_ATT_TSC), BTS_TSC(bts));</span><br><span style="color: hsl(0, 100%, 40%);">- return -NM_NACK_PARAM_RANGE;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24389">change 24389</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-bts/+/24389"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iaa5aced70e166963106c27ebdb09adaae22daea4 </div>
<div style="display:none"> Gerrit-Change-Number: 24389 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>