phone-side
/
osmocom-bb
mirror of https://gerrit.osmocom.org/osmocom-bb
9
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Vadim Yanitskiy 2017-08-13 01:20:19 +06:00
parent 8e13093c88
commit 82b8c21b21
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/host/trxcon/l1ctl.c
View File

@ -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);

4
src/host/trxcon/sched_lchan_xcch.c
View File

@ -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);