diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/oml.c | 7 | ||||
| -rw-r--r-- | src/osmo-bts-lc15/oml.c | 15 | ||||
| -rw-r--r-- | src/osmo-bts-oc2g/oml.c | 15 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/oml.c | 14 |
4 files changed, 7 insertions, 44 deletions
diff --git a/src/common/oml.c b/src/common/oml.c index 0a502c10..7bf89c54 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -962,6 +962,13 @@ static int oml_rx_set_chan_attr(struct gsm_bts_trx_ts *ts, struct msgb *msg) /* 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 3010fe75..acce1d42 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -1827,21 +1827,6 @@ int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type, 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 151b92e1..5646cfba 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -1836,21 +1836,6 @@ int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type, 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 25c56519..818d82bc 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1741,20 +1741,6 @@ int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type, 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; } |