summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2017-08-13 01:20:19 +0600
committerVadim Yanitskiy <axilirator@gmail.com>2017-10-23 22:05:49 +0330
commitd562255653f2002ac7555f260c9042691d690e40 (patch)
treecadc168bbe5fc6cf99225c7a1be42e727d4c61e8
parent665e1e2baad0aed753d4dc59f27f985414d77b50 (diff)
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
-rw-r--r--src/host/trxcon/l1ctl.c6
-rw-r--r--src/host/trxcon/sched_lchan_xcch.c4
2 files changed, 3 insertions, 7 deletions
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 @@ static int l1ctl_rx_data_req(struct l1ctl_link *l1l, struct msgb *msg)
/* 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 @@ int tx_data_fn(struct trx_instance *trx, struct trx_ts *ts,
{
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 @@ int tx_data_fn(struct trx_instance *trx, struct trx_ts *ts,
/* 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);