[MERGED] osmo-bts[master]: dyn PDCH: code dup: use conf_lchans_as_pchan()

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: dyn PDCH: code dup: use conf_lchans_as_pchan()
......................................................................


dyn PDCH: code dup: use conf_lchans_as_pchan()

For ip.access dyn PDCH, call conf_lchans_as_pchan() instead of dup'ing the
pchan-to-lchan switch.

Change-Id: I979828e08953e83ae579a347334536f52939faf0
---
M src/common/rsl.c
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/src/common/rsl.c b/src/common/rsl.c
index 10b95ae..aac520c 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1784,19 +1784,23 @@
 		LOGP(DRSL, LOGL_DEBUG,
 		     "%s PDCH DEACT operation: channel disconnected, will reconnect as TCH\n",
 		     gsm_lchan_name(ts->lchan));
-		ts->lchan[0].type = GSM_LCHAN_TCH_F;
 		as_pchan = GSM_PCHAN_TCH_F;
 	} else if (ts->flags & TS_F_PDCH_ACT_PENDING) {
 		LOGP(DRSL, LOGL_DEBUG,
 		     "%s PDCH ACT operation: channel disconnected, will reconnect as PDTCH\n",
 		     gsm_lchan_name(ts->lchan));
-		ts->lchan[0].type = GSM_LCHAN_PDTCH;
 		as_pchan = GSM_PCHAN_PDCH;
 	} else
 		/* No reconnect pending. */
 		return;
 
+	rc = conf_lchans_as_pchan(ts, as_pchan);
+	if (rc)
+		goto error_nack;
+
 	rc = bts_model_ts_connect(ts, as_pchan);
+
+error_nack:
 	/* Error? then NACK right now. */
 	if (rc)
 		ipacc_dyn_pdch_complete(ts, rc);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I979828e08953e83ae579a347334536f52939faf0
Gerrit-PatchSet: 4
Gerrit-Project: osmo-bts
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 Hofmeyr <nhofmeyr at sysmocom.de>