layer23: modem: Pass fn from lapdm to L1CTL-CCCH_DATA.ind

Change-Id: I7a9f31ae363fe7de019ff1a906f3978ff3074036
---
M src/host/layer23/src/modem/grr.c
1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/host/layer23/src/modem/grr.c b/src/host/layer23/src/modem/grr.c
index e4fd23c..c6f2a32 100644
--- a/src/host/layer23/src/modem/grr.c
+++ b/src/host/layer23/src/modem/grr.c
@@ -95,9 +95,10 @@
 static int forward_to_rlcmac(struct osmocom_ms *ms, struct msgb *msg)
 {
 	struct osmo_gprs_rlcmac_prim *rlcmac_prim;
+	const uint32_t fn = *(uint32_t *)(&msg->cb[0]);
 
 	/* Forward SI13 to RLC/MAC layer */
-	rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_data_ind(0 /* TODO: fn */, msgb_l3(msg));
+	rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_data_ind(fn, msgb_l3(msg));
 	return osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim);
 }
 
@@ -204,9 +205,10 @@
 {
 	const struct gsm48_system_information_type_header *si_hdr = msgb_l3(msg);
 	const uint8_t si_type = si_hdr->system_information;
+	const uint32_t fn = *(uint32_t *)(&msg->cb[0]);
 
-	LOGP(DRR, LOGL_INFO, "BCCH message (type=0x%02x): %s\n",
-	     si_type, gsm48_rr_msg_name(si_type));
+	LOGP(DRR, LOGL_INFO, "BCCH message (type=0x%02x, fn=%u): %s\n",
+	     si_type, fn, gsm48_rr_msg_name(si_type));
 
 	switch (si_type) {
 	case GSM48_MT_RR_SYSINFO_1:
@@ -420,6 +422,9 @@
 	const struct abis_rsl_common_hdr *rslh = msgb_l2(msg);
 	int rc;
 
+	/* Obtain FN from message context: */
+	*(uint32_t *)(&msg->cb[0]) = le->datalink[DL_SAPI0].mctx.fn;
+
 	switch (rslh->msg_discr & 0xfe) {
 	case ABIS_RSL_MDISC_RLL:
 		rc = grr_rx_rslms_rll((struct osmocom_ms *)ctx, msg);

