aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/src/libbsc/bts_nokia_site.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@gnumonks.org>2011-08-17 22:43:54 +0200
committerHarald Welte <laforge@gnumonks.org>2011-08-19 22:38:33 +0200
commit7abecfcfc9ef94c1367cd88ac858b79d20f75db0 (patch)
treeb9df6f561a169ec9ca174217ac6b0a7eafda0686 /openbsc/src/libbsc/bts_nokia_site.c
parentc45a8045a645d64782ab2afbce79732d3f9d12a1 (diff)
src: use new msg->dst pointer instead of deprecated msg->trx
This patch modifies openBSC code to use msg->dst which stores the pointer to the signalling link structure instead of the pointer to the transceiver structure. This patch prepares the introduction of libosmo-abis.
Diffstat (limited to 'openbsc/src/libbsc/bts_nokia_site.c')
-rw-r--r--openbsc/src/libbsc/bts_nokia_site.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/openbsc/src/libbsc/bts_nokia_site.c b/openbsc/src/libbsc/bts_nokia_site.c
index b5bc2fec0..8ba01d057 100644
--- a/openbsc/src/libbsc/bts_nokia_site.c
+++ b/openbsc/src/libbsc/bts_nokia_site.c
@@ -1474,7 +1474,8 @@ static void reset_timer_cb(void *_bts)
static int abis_nm_rcvmsg_fom(struct msgb *mb)
{
- struct gsm_bts *bts = mb->trx->bts;
+ struct e1inp_sign_link *sign_link = (struct e1inp_sign_link *)mb->dst;
+ struct gsm_bts *bts = sign_link->trx->bts;
struct abis_om_hdr *oh = msgb_l2(mb);
struct abis_om_nokia_hdr *noh = msgb_l3(mb);
uint8_t mt = noh->msg_type;
@@ -1579,7 +1580,8 @@ static int abis_nm_rcvmsg_fom(struct msgb *mb)
if (bts->nokia.configured != 0) {
/* start TRX (RSL link) */
- struct gsm_e1_subslot *e1_link = &mb->trx->rsl_e1_link;
+ struct gsm_e1_subslot *e1_link =
+ &sign_link->trx->rsl_e1_link;
struct e1inp_line *line;
bts->nokia.configured = 0;
@@ -1590,7 +1592,7 @@ static int abis_nm_rcvmsg_fom(struct msgb *mb)
LOGP(DINP, LOGL_ERROR,
"TRX (%u/%u) RSL link referring "
"to non-existing E1 line %u\n",
- mb->trx->bts->nr, mb->trx->nr,
+ sign_link->trx->bts->nr, sign_link->trx->nr,
e1_link->e1_nr);
return -ENOMEM;
}