Change in osmo-bts[master]: l1sap: check BTS_FEAT_MULTI_TSC in l1sap_chan_act()

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23672 )

Change subject: l1sap: check BTS_FEAT_MULTI_TSC in l1sap_chan_act()
......................................................................

l1sap: check BTS_FEAT_MULTI_TSC in l1sap_chan_act()

Instead of blindly assuming what the PHY does support, and what
it does not, let's check the related feature vector.

Change-Id: I699cdddbfab111855998853548d9cfe956f7c60c
Related: SYS#4895, OS#4941
---
M src/common/l1sap.c
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 3ebe8e1..b8bfa31 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -1973,11 +1973,11 @@
 		cd = (struct gsm48_chan_desc *)
 		TLVP_VAL(tp, GSM48_IE_CHANDESC_2);
 
-		/* 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 (cd->h0.tsc != (trx->bts->bsic & 7)) {
-			LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "lchan TSC %u != BSIC-TSC %u\n",
+		/* The PHY may not support using different TSCs */
+		if (!osmo_bts_has_feature(trx->bts->features, BTS_FEAT_MULTI_TSC)
+		    && cd->h0.tsc != (trx->bts->bsic & 7)) {
+			LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "This PHY does not support "
+				  "lchan TSC %u != BSIC-TSC %u, sending NACK\n",
 				  cd->h0.tsc, trx->bts->bsic & 7);
 			return -RSL_ERR_SERV_OPT_UNIMPL;
 		}

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23672
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I699cdddbfab111855998853548d9cfe956f7c60c
Gerrit-Change-Number: 23672
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210412/da468afa/attachment.htm>