From a5a03d6b355437df1d7c5213236b0096b12640af Mon Sep 17 00:00:00 2001 From: Philipp Maier Date: Fri, 15 Mar 2019 12:08:05 +0100 Subject: oml: use oml_tx_failure_event_rep() instead of oml_fail_rep() The function oml_tx_failure_event_rep() replaces oml_fail_rep(), so lets use only oml_tx_failure_event_rep() and remove oml_fail_rep() Change-Id: I83c4fa9ebd519299fd54b37b5d95d6d7c1da24f6 Related: OS#3843 --- src/common/rsl.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src/common/rsl.c') diff --git a/src/common/rsl.c b/src/common/rsl.c index 9334ed9d..f93ca50d 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -466,9 +466,10 @@ static int rsl_rx_paging_cmd(struct gsm_bts_trx *trx, struct msgb *msg) rc = paging_add_identity(bts->paging_state, paging_group, identity_lv, chan_needed); if (rc < 0) { /* FIXME: notfiy the BSC on other errors? */ - if (rc == -ENOSPC) - oml_fail_rep(OSMO_EVT_MIN_PAG_TAB_FULL, - "BTS paging table is full"); + if (rc == -ENOSPC) { + oml_tx_failure_event_rep(&trx->bts->mo, OSMO_EVT_MIN_PAG_TAB_FULL, + "BTS paging table is full"); + } } pcu_tx_pag_req(identity_lv, chan_needed); @@ -1938,9 +1939,10 @@ static int rsl_rx_ipac_XXcx(struct msgb *msg) LOGP(DRTP, LOGL_ERROR, "%s IPAC Failed to create RTP/RTCP sockets\n", gsm_lchan_name(lchan)); - oml_fail_rep(OSMO_EVT_CRIT_RTP_TOUT, - "%s IPAC Failed to create RTP/RTCP sockets", - gsm_lchan_name(lchan)); + oml_tx_failure_event_rep(&lchan->ts->trx->mo, + OSMO_EVT_CRIT_RTP_TOUT, + "%s IPAC Failed to create RTP/RTCP sockets", + gsm_lchan_name(lchan)); return tx_ipac_XXcx_nack(lchan, RSL_ERR_RES_UNAVAIL, inc_ip_port, dch->c.msg_type); } @@ -1979,9 +1981,10 @@ static int rsl_rx_ipac_XXcx(struct msgb *msg) LOGP(DRTP, LOGL_ERROR, "%s IPAC Failed to bind RTP/RTCP sockets\n", gsm_lchan_name(lchan)); - oml_fail_rep(OSMO_EVT_CRIT_RTP_TOUT, - "%s IPAC Failed to bind RTP/RTCP sockets", - gsm_lchan_name(lchan)); + oml_tx_failure_event_rep(&lchan->ts->trx->mo, + OSMO_EVT_CRIT_RTP_TOUT, + "%s IPAC Failed to bind RTP/RTCP sockets", + gsm_lchan_name(lchan)); osmo_rtp_socket_free(lchan->abis_ip.rtp_socket); lchan->abis_ip.rtp_socket = NULL; msgb_queue_flush(&lchan->dl_tch_queue); -- cgit v1.2.3