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