summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2019-01-17 16:57:41 +0700
committerVadim Yanitskiy <axilirator@gmail.com>2019-02-21 17:25:00 +0700
commitc45e3f613936d848e7ea9dd1d02cd7b36bd9bc42 (patch)
tree257c24fd18627c30602725fbed1c106aac2e21e2
parentbcc293bf83a512ac30dba75a11d684caab8df45a (diff)
trxcon/l1ctl.c: accept band_arfcn as a parameter
-rw-r--r--src/host/trxcon/l1ctl.c5
-rw-r--r--src/host/trxcon/l1ctl.h3
-rw-r--r--src/host/trxcon/sched_lchan_rach.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c
index fa1363d8..01c72520 100644
--- a/src/host/trxcon/l1ctl.c
+++ b/src/host/trxcon/l1ctl.c
@@ -222,7 +222,8 @@ int l1ctl_tx_dt_ind(struct l1ctl_link *l1l, struct l1ctl_info_dl *data,
return l1ctl_link_send(l1l, msg);
}
-int l1ctl_tx_rach_conf(struct l1ctl_link *l1l, uint32_t fn)
+int l1ctl_tx_rach_conf(struct l1ctl_link *l1l,
+ uint16_t band_arfcn, uint32_t fn)
{
struct l1ctl_info_dl *dl;
struct msgb *msg;
@@ -236,7 +237,7 @@ int l1ctl_tx_rach_conf(struct l1ctl_link *l1l, uint32_t fn)
dl = (struct l1ctl_info_dl *) msgb_put(msg, len);
memset(dl, 0x00, len);
- dl->band_arfcn = htons(l1l->trx->band_arfcn);
+ dl->band_arfcn = htons(band_arfcn);
dl->frame_nr = htonl(fn);
return l1ctl_link_send(l1l, msg);
diff --git a/src/host/trxcon/l1ctl.h b/src/host/trxcon/l1ctl.h
index 76b49e3f..ebf9b2d3 100644
--- a/src/host/trxcon/l1ctl.h
+++ b/src/host/trxcon/l1ctl.h
@@ -23,4 +23,5 @@ int l1ctl_tx_dt_ind(struct l1ctl_link *l1l, struct l1ctl_info_dl *data,
uint8_t *l2, size_t l2_len, bool traffic);
int l1ctl_tx_dt_conf(struct l1ctl_link *l1l,
struct l1ctl_info_dl *data, bool traffic);
-int l1ctl_tx_rach_conf(struct l1ctl_link *l1l, uint32_t fn);
+int l1ctl_tx_rach_conf(struct l1ctl_link *l1l,
+ uint16_t band_arfcn, uint32_t fn);
diff --git a/src/host/trxcon/sched_lchan_rach.c b/src/host/trxcon/sched_lchan_rach.c
index ecf5df81..ee5faa0e 100644
--- a/src/host/trxcon/sched_lchan_rach.c
+++ b/src/host/trxcon/sched_lchan_rach.c
@@ -113,7 +113,7 @@ int tx_rach_fn(struct trx_instance *trx, struct trx_ts *ts,
}
/* Confirm RACH request */
- l1ctl_tx_rach_conf(trx->l1l, fn);
+ l1ctl_tx_rach_conf(trx->l1l, trx->band_arfcn, fn);
/* Forget processed primitive */
sched_prim_drop(lchan);