[MERGED] openbsc[master]: dyn TS: verify_chan_comb(): handle new dyn TS NM_CHANC_*

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: dyn TS: verify_chan_comb(): handle new dyn TS NM_CHANC_*
......................................................................


dyn TS: verify_chan_comb(): handle new dyn TS NM_CHANC_*

Change-Id: I7ce754a48c7f492e921a4450745383bb8dd7225c
---
M openbsc/src/libbsc/abis_nm.c
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c
index 3afc4c4..3289b3c 100644
--- a/openbsc/src/libbsc/abis_nm.c
+++ b/openbsc/src/libbsc/abis_nm.c
@@ -1494,6 +1494,7 @@
 		switch (chan_comb) {
 		case NM_CHANC_TCHHalf:
 		case NM_CHANC_TCHHalf2:
+		case NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH:
 			/* not supported */
 			*reason = "TCH/H is not supported.";
 			return -EINVAL;
@@ -1590,6 +1591,7 @@
 				case NM_CHANC_TCHHalf:
 				case NM_CHANC_IPAC_TCHFull_TCHHalf:
 				case NM_CHANC_IPAC_TCHFull_PDCH:
+				case NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH:
 					return 0;
 				default:
 					*reason = "TS1 must carry a CBCH, SDCCH or TCH.";
@@ -1621,6 +1623,7 @@
 				return 0;
 			case NM_CHANC_IPAC_PDCH:
 			case NM_CHANC_IPAC_TCHFull_PDCH:
+			case NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH:
 				if (ts->trx->nr == 0)
 					return 0;
 				else {

-- 
To view, visit https://gerrit.osmocom.org/596
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ce754a48c7f492e921a4450745383bb8dd7225c
Gerrit-PatchSet: 3
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels_test_account <neels at hofmeyr.de>