diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-09-26 23:43:23 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-09-26 23:44:49 +0200 |
| commit | 15eae8dcafc86400a6340b8dcb4b5e8ec3a4fe66 (patch) | |
| tree | 80c8b7b6bd2287d19c3152f1f99aa07fc31d19b3 /openbsc/src/libbsc/abis_nm.c | |
| parent | 4f8ad5350a1e4dbccf72cc4a61f2b3665e5202ac (diff) | |
Fix Ericsson RBS2000 support after libosmo-abis merge
The libosmo-abis merge broke Ericsson RBS support, as it didn't get the
part right where the per-TRX OML sign_link is determined while
transmitting OM2000 messages.
As a result of this fix, we can remove the 'to_trx_oml' parameter to
_abis_nm_sendmsg(), which is a nice cleanup.
Diffstat (limited to 'openbsc/src/libbsc/abis_nm.c')
| -rw-r--r-- | openbsc/src/libbsc/abis_nm.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index 027a2638b..a01826bd5 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -114,10 +114,8 @@ static struct msgb *nm_msgb_alloc(void) "OML"); } -int _abis_nm_sendmsg(struct msgb *msg, int to_trx_oml) +int _abis_nm_sendmsg(struct msgb *msg) { - struct e1inp_sign_link *sign_link = msg->dst; - msg->l2h = msg->data; if (!msg->dst) { @@ -125,12 +123,6 @@ int _abis_nm_sendmsg(struct msgb *msg, int to_trx_oml) return -EINVAL; } - /* Check for TRX-specific OML link first */ - if (to_trx_oml) { - if (!sign_link->trx->oml_link) - return -ENODEV; - msg->dst = sign_link->trx->oml_link; - } return abis_sendmsg(msg); } @@ -142,7 +134,7 @@ static int abis_nm_queue_msg(struct gsm_bts *bts, struct msgb *msg) /* queue OML messages */ if (llist_empty(&bts->abis_queue) && !bts->abis_nm_pend) { bts->abis_nm_pend = OBSC_NM_W_ACK_CB(msg); - return _abis_nm_sendmsg(msg, 0); + return _abis_nm_sendmsg(msg); } else { msgb_enqueue(&bts->abis_queue, msg); return 0; @@ -508,7 +500,7 @@ void abis_nm_queue_send_next(struct gsm_bts *bts) while (!llist_empty(&bts->abis_queue)) { msg = msgb_dequeue(&bts->abis_queue); wait = OBSC_NM_W_ACK_CB(msg); - _abis_nm_sendmsg(msg, 0); + _abis_nm_sendmsg(msg); if (wait) break; |