fixeria has uploaded this change for review.

View Change

virt_phy: l1ctl_rx_rach_req(): use the indicated chan_nr/link_id

Change-Id: I820f32851f1c7a39695270cc246964a3e212118f
---
M src/host/virt_phy/src/virt_prim_rach.c
1 file changed, 18 insertions(+), 5 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/73/32673/1

diff --git a/src/host/virt_phy/src/virt_prim_rach.c b/src/host/virt_phy/src/virt_prim_rach.c
index 5a3b61a..f6cb496 100644
--- a/src/host/virt_phy/src/virt_prim_rach.c
+++ b/src/host/virt_phy/src/virt_prim_rach.c
@@ -87,10 +87,13 @@
 	msg->l2h = msgb_put(msg, sizeof(uint8_t));
 	*msg->l2h = rach_req->ra;
 
-	/* chan_nr need to be encoded here, as it is not set by l23 for
-	 * the rach request, but needed by virt um */
-	ul->chan_nr = RSL_CHAN_RACH;
-	ul->link_id = LID_DEDIC;
+	/* use the indicated RSL chan_nr/link_id, if provided */
+	if (ul->chan_nr == 0x00) {
+		LOGPMS(DL1C, LOGL_NOTICE, ms,
+		       "The UL info header is empty, assuming RACH is on TS0\n");
+		ul->chan_nr = RSL_CHAN_RACH;
+		ul->link_id = LID_DEDIC;
+	}
 
 	/* sched fn calculation if we have a combined ccch channel configuration */
 	if (rach_req->combined) {
@@ -103,7 +106,8 @@
 	} else
 		fn_sched = l1s->current_time.fn + offset;
 
-	virt_l1_sched_schedule(ms, msg, fn_sched, 0, &virt_l1_sched_handler_cb);
+	virt_l1_sched_schedule(ms, msg, fn_sched, ul->chan_nr & 0x07,
+			       &virt_l1_sched_handler_cb);
 }
 
 /**

To view, visit change 32673. To unsubscribe, or for help writing mail filters, visit settings.