[MERGED] openbsc[master]: chan_alloc.c: use ts_subslots() instead of subslots_per_pchan[]

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: chan_alloc.c: use ts_subslots() instead of subslots_per_pchan[]
......................................................................


chan_alloc.c: use ts_subslots() instead of subslots_per_pchan[]

The array will move to gsm_data_shared.c; to prepare, use the function
instead.

Change-Id: Icbea7dbd78abf6144e5291f531a97f96507d8cbf
---
M openbsc/src/libbsc/chan_alloc.c
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c
index d9808f4..92a1358 100644
--- a/openbsc/src/libbsc/chan_alloc.c
+++ b/openbsc/src/libbsc/chan_alloc.c
@@ -170,13 +170,13 @@
 				/* The requested type matches the dynamic
 				 * timeslot's current mode. A channel may still
 				 * be available (think TCH/H). */
-				check_subslots = subslots_per_pchan[ts->dyn.pchan_is];
+				check_subslots = ts_subslots(ts);
 			} else
 				/* Otherwise this slot is not applicable. */
 				continue;
 		} else {
 			/* Not a dynamic channel, there is only one pchan kind: */
-			check_subslots = subslots_per_pchan[pchan];
+			check_subslots = ts_subslots(ts);
 		}
 
 		/* Is a sub-slot still available? */

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

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