diff options
Diffstat (limited to 'src/osmo-bsc')
| -rw-r--r-- | src/osmo-bsc/handover_decision_2.c | 8 | ||||
| -rw-r--r-- | src/osmo-bsc/handover_fsm.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 3fa1084e4..af36c3189 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -854,7 +854,7 @@ static int trigger_local_ho_or_as(struct ho_candidate *c, uint8_t requirements) if ((requirements & REQUIREMENT_TCHF_MASK)) { if (c->current.bts == c->target.bts) { LOGPHOLCHAN(c->current.lchan, LOGL_INFO, "Not performing assignment: Already on target type\n"); - return 0; + return -EALREADY; } full_rate = true; break; @@ -886,7 +886,7 @@ static int trigger_local_ho_or_as(struct ho_candidate *c, uint8_t requirements) } if (c->current.bts == c->target.bts) { LOGPHOLCHAN(c->current.lchan, LOGL_INFO, "Not performing assignment: Already on target type\n"); - return 0; + return -EALREADY; } break; default: @@ -899,8 +899,8 @@ static int trigger_local_ho_or_as(struct ho_candidate *c, uint8_t requirements) LOGPHOLCHAN(c->current.lchan, LOGL_NOTICE, "Triggering assignment to %s, due to %s\n", full_rate ? "TCH/F" : "TCH/H", ho_reason_name(global_ho_reason)); - reassignment_request_to_chan_type(ASSIGN_FOR_CONGESTION_RESOLUTION, c->current.lchan, - full_rate? GSM_LCHAN_TCH_F : GSM_LCHAN_TCH_H); + return reassignment_request_to_chan_type(ASSIGN_FOR_CONGESTION_RESOLUTION, c->current.lchan, + full_rate? GSM_LCHAN_TCH_F : GSM_LCHAN_TCH_H); } else { struct handover_out_req req = { .from_hodec_id = HODEC2, diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 5f4b8928a..797a336e8 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -219,7 +219,7 @@ static const struct osmo_tdef_state_timeout ho_fsm_timeouts[32] = { } while(0) /* issue handover to a cell identified by ARFCN and BSIC */ -void handover_request(struct handover_out_req *req) +int handover_request(struct handover_out_req *req) { struct gsm_subscriber_connection *conn; OSMO_ASSERT(req->old_lchan); @@ -229,7 +229,7 @@ void handover_request(struct handover_out_req *req) /* To make sure we're allowed to start a handover, go through a gscon event dispatch. If that is accepted, the * same req is passed to handover_start(). */ - osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_HANDOVER_START, req); + return osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_HANDOVER_START, req); } /* Check that ho has old_lchan and/or new_lchan and conn pointers match. |