diff options
| -rw-r--r-- | openbsc/src/libbsc/bsc_api.c | 14 | ||||
| -rw-r--r-- | openbsc/src/libbsc/handover_logic.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c index e0ba6063f..ad89fb2a6 100644 --- a/openbsc/src/libbsc/bsc_api.c +++ b/openbsc/src/libbsc/bsc_api.c @@ -141,7 +141,7 @@ static void assignment_t10_timeout(void *_conn) * secondary_channel has not been released by the handle_chan_nack. */ if (conn->secondary_lchan) - lchan_release(conn->secondary_lchan, 0, 1); + lchan_release(conn->secondary_lchan, 0, RSL_REL_LOCAL_END); conn->secondary_lchan = NULL; /* inform them about the failure */ @@ -416,7 +416,7 @@ static void handle_ass_compl(struct gsm_subscriber_connection *conn, /* swap channels */ osmo_timer_del(&conn->T10); - lchan_release(conn->lchan, 0, 1); + lchan_release(conn->lchan, 0, RSL_REL_LOCAL_END); conn->lchan = conn->secondary_lchan; conn->secondary_lchan = NULL; @@ -444,7 +444,7 @@ static void handle_ass_fail(struct gsm_subscriber_connection *conn, /* stop the timer and release it */ osmo_timer_del(&conn->T10); - lchan_release(conn->secondary_lchan, 0, 1); + lchan_release(conn->secondary_lchan, 0, RSL_REL_LOCAL_END); conn->secondary_lchan = NULL; gh = msgb_l3(msg); @@ -649,7 +649,7 @@ int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id) rc = BSC_API_CONN_POL_REJECT; lchan->conn = subscr_con_allocate(msg->lchan); if (!lchan->conn) { - lchan_release(lchan, 1, 0); + lchan_release(lchan, 1, RSL_REL_NORMAL); return -1; } @@ -659,7 +659,7 @@ int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id) if (rc != BSC_API_CONN_POL_ACCEPT) { lchan->conn->lchan = NULL; subscr_con_free(lchan->conn); - lchan_release(lchan, 1, 0); + lchan_release(lchan, 1, RSL_REL_NORMAL); } } @@ -698,10 +698,10 @@ int gsm0808_clear(struct gsm_subscriber_connection *conn) bsc_clear_handover(conn, 1); if (conn->secondary_lchan) - lchan_release(conn->secondary_lchan, 0, 1); + lchan_release(conn->secondary_lchan, 0, RSL_REL_LOCAL_END); if (conn->lchan) - lchan_release(conn->lchan, 1, 0); + lchan_release(conn->lchan, 1, RSL_REL_NORMAL); conn->lchan = NULL; conn->secondary_lchan = NULL; diff --git a/openbsc/src/libbsc/handover_logic.c b/openbsc/src/libbsc/handover_logic.c index 5ce33018c..d2cd5efd9 100644 --- a/openbsc/src/libbsc/handover_logic.c +++ b/openbsc/src/libbsc/handover_logic.c @@ -167,7 +167,7 @@ void bsc_clear_handover(struct gsm_subscriber_connection *conn, int free_lchan) conn->ho_lchan = NULL; if (free_lchan) - lchan_release(ho->new_lchan, 0, 1); + lchan_release(ho->new_lchan, 0, RSL_REL_LOCAL_END); osmo_timer_del(&ho->T3103); llist_del(&ho->list); @@ -185,7 +185,7 @@ static void ho_T3103_cb(void *_ho) ho->new_lchan->conn->ho_lchan = NULL; ho->new_lchan->conn = NULL; - lchan_release(ho->new_lchan, 0, 1); + lchan_release(ho->new_lchan, 0, RSL_REL_LOCAL_END); llist_del(&ho->list); talloc_free(ho); } @@ -276,7 +276,7 @@ static int ho_gsm48_ho_compl(struct gsm_lchan *new_lchan) ho->old_lchan->conn = NULL; rsl_lchan_set_state(ho->old_lchan, LCHAN_S_INACTIVE); - lchan_release(ho->old_lchan, 0, 1); + lchan_release(ho->old_lchan, 0, RSL_REL_LOCAL_END); /* do something to re-route the actual speech frames ! */ @@ -306,7 +306,7 @@ static int ho_gsm48_ho_fail(struct gsm_lchan *old_lchan) /* release the channel and forget about it */ ho->new_lchan->conn->ho_lchan = NULL; ho->new_lchan->conn = NULL; - lchan_release(ho->new_lchan, 0, 1); + lchan_release(ho->new_lchan, 0, RSL_REL_LOCAL_END); talloc_free(ho); |