[PATCH] osmocom-bb[master]: host/trxcon/l1ctl.c: don't fill l1ctl_info_ul into a primitive

[Harald Welte]

Review at  https://gerrit.osmocom.org/6773

host/trxcon/l1ctl.c: don't fill l1ctl_info_ul into a primitive

The UL frame header isn't used by lchan handlers.

Change-Id: Ia1c63b6f17c3802b29f54299da1151a39edf3a03
---
M src/host/trxcon/l1ctl.c
M src/host/trxcon/sched_lchan_xcch.c
2 files changed, 3 insertions(+), 7 deletions(-)


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

diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c
index 8f96890..f193a7a 100644
--- a/src/host/trxcon/l1ctl.c
+++ b/src/host/trxcon/l1ctl.c
@@ -645,10 +645,8 @@
 	/* Set logical channel of primitive */
 	prim->chan = lchan_type;
 
-	/* Fill in both UL info and payload */
-	len = sizeof(struct l1ctl_info_ul);
-	memcpy(prim->payload, ul, len);
-	memcpy(prim->payload + len, data_ind, 23);
+	/* Fill in the payload */
+	memcpy(prim->payload, data_ind, 23);
 
 	/* Add to TS queue */
 	llist_add_tail(&prim->list, &ts->tx_prims);
diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c
index afaacac..62c44f9 100644
--- a/src/host/trxcon/sched_lchan_xcch.c
+++ b/src/host/trxcon/sched_lchan_xcch.c
@@ -137,7 +137,6 @@
 {
 	const struct trx_lchan_desc *lchan_desc;
 	struct trx_ts_prim *prim;
-	struct l1ctl_info_ul *ul;
 	ubit_t burst[GSM_BURST_LEN];
 	ubit_t *buffer, *offset;
 	uint8_t *mask, *l2;
@@ -161,8 +160,7 @@
 
 	/* Get a message from TX queue */
 	prim = llist_entry(ts->tx_prims.next, struct trx_ts_prim, list);
-	ul = (struct l1ctl_info_ul *) prim->payload;
-	l2 = (uint8_t *) ul->payload;
+	l2 = (uint8_t *) prim->payload;
 
 	/* Encode bursts */
 	rc = gsm0503_xcch_encode(buffer, l2);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1c63b6f17c3802b29f54299da1151a39edf3a03
Gerrit-PatchSet: 1
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>