Change in osmocom-bb[master]: trxcon/l1ctl.c: on L1CTL_DM_EST_REQ, determine pchan_config first

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/14272


Change subject: trxcon/l1ctl.c: on L1CTL_DM_EST_REQ, determine pchan_config first
......................................................................

trxcon/l1ctl.c: on L1CTL_DM_EST_REQ, determine pchan_config first

It makes sense to do this first, before tuning to a different
ARFCN and changing the training sequence. Otherwise, if no
multi-frame configuration is found, trxcon would switch to
a different channel and then remain inactive there.

Change-Id: I274588ce3a9c49372b5da0629930afece46f799c
---
M src/host/trxcon/l1ctl.c
1 file changed, 8 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/72/14272/1

diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c
index d745295..fff1c2b 100644
--- a/src/host/trxcon/l1ctl.c
+++ b/src/host/trxcon/l1ctl.c
@@ -637,6 +637,14 @@
 		"(tn=%u, chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n",
 		tn, chan_nr, est_req->tsc, est_req->tch_mode);
 
+	/* Determine channel config */
+	config = sched_trx_chan_nr2pchan_config(chan_nr);
+	if (config == GSM_PCHAN_NONE) {
+		LOGP(DL1C, LOGL_ERROR, "Couldn't determine channel config\n");
+		rc = -EINVAL;
+		goto exit;
+	}
+
 	/* Frequency hopping? */
 	if (est_req->h)
 		rc = l1ctl_proc_est_req_h1(l1l->trx, &est_req->h1);
@@ -648,14 +656,6 @@
 	/* Update TSC (Training Sequence Code) */
 	l1l->trx->tsc = est_req->tsc;
 
-	/* Determine channel config */
-	config = sched_trx_chan_nr2pchan_config(chan_nr);
-	if (config == GSM_PCHAN_NONE) {
-		LOGP(DL1C, LOGL_ERROR, "Couldn't determine channel config\n");
-		rc = -EINVAL;
-		goto exit;
-	}
-
 	/* Configure requested TS */
 	rc = sched_trx_configure_ts(l1l->trx, tn, config);
 	ts = l1l->trx->ts_list[tn];

-- 
To view, visit https://gerrit.osmocom.org/14272
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I274588ce3a9c49372b5da0629930afece46f799c
Gerrit-Change-Number: 14272
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190529/fa561156/attachment.htm>