[MERGED] openbsc[master]: dyn TS: chan act: set chan_nr according to dyn pchan type

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Thu Jul 28 16:56:50 UTC 2016


Harald Welte has submitted this change and it was merged.

Change subject: dyn TS: chan act: set chan_nr according to dyn pchan type
......................................................................


dyn TS: chan act: set chan_nr according to dyn pchan type

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

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



diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index 868375f..e260ce9 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -442,7 +442,6 @@
 	uint8_t *len;
 	uint8_t ta;
 
-	uint8_t chan_nr = gsm_lchan2chan_nr(lchan);
 	struct rsl_ie_chan_mode cm;
 	struct gsm48_chan_desc cd;
 
@@ -477,7 +476,12 @@
 	msg = rsl_msgb_alloc();
 	dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh));
 	init_dchan_hdr(dh, RSL_MT_CHAN_ACTIV);
-	dh->chan_nr = chan_nr;
+
+	if (lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH)
+		dh->chan_nr = gsm_lchan_as_pchan2chan_nr(
+					lchan, lchan->ts->dyn.pchan_want);
+	else
+		dh->chan_nr = gsm_lchan2chan_nr(lchan);
 
 	msgb_tv_put(msg, RSL_IE_ACT_TYPE, act_type);
 	msgb_tlv_put(msg, RSL_IE_CHAN_MODE, sizeof(cm),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica5ef2197b3e97d5e895f3e3221295d5d0ef8908
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>



More information about the gerrit-log mailing list