cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

HO: cosmetic: handover_decision.c: make process_meas_rep() return void 

The function's return value is ignored. An upcoming patch will use this as
callback function and requires a void return.

Change-Id: Id455a8becbb43884e8205d87b0371b216d0119fc
This commit is contained in:
Neels Hofmeyr 2018-02-15 14:12:40 +01:00
parent ec42264113
commit 047ac0dc00
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/libbsc/handover_decision.c
View File

@ -257,7 +257,7 @@ static int attempt_handover(struct gsm_meas_rep *mr)
/* process an already parsed measurement report and decide if we want to /* process an already parsed measurement report and decide if we want to
* attempt a handover */ * attempt a handover */
static int process_meas_rep(struct gsm_meas_rep *mr) static void process_meas_rep(struct gsm_meas_rep *mr)
{ {
struct gsm_bts *bts = mr->lchan->ts->trx->bts; struct gsm_bts *bts = mr->lchan->ts->trx->bts;
enum meas_rep_field dlev, dqual; enum meas_rep_field dlev, dqual;
@ -266,7 +266,7 @@ static int process_meas_rep(struct gsm_meas_rep *mr)
/* If this cell does not use handover algorithm 1, then we're not responsible. */ /* If this cell does not use handover algorithm 1, then we're not responsible. */
if (ho_get_algorithm(bts->ho) != 1) if (ho_get_algorithm(bts->ho) != 1)
return 0; return;
/* we currently only do handover for TCH channels */ /* we currently only do handover for TCH channels */
switch (mr->lchan->type) { switch (mr->lchan->type) {
@ -274,7 +274,7 @@ static int process_meas_rep(struct gsm_meas_rep *mr)
case GSM_LCHAN_TCH_H: case GSM_LCHAN_TCH_H:
break; break;
default: default:
return 0; return;
} }
if (mr->flags & MEAS_REP_F_DL_DTX) { if (mr->flags & MEAS_REP_F_DL_DTX) {
@ -297,26 +297,30 @@ static int process_meas_rep(struct gsm_meas_rep *mr)
meas_rep_n_out_of_m_be(mr->lchan, dqual, 3, 4, 5)) { meas_rep_n_out_of_m_be(mr->lchan, dqual, 3, 4, 5)) {
LOGPC(DHO, LOGL_INFO, "HO cause: Interference HO av_rxlev=%d dBm\n", LOGPC(DHO, LOGL_INFO, "HO cause: Interference HO av_rxlev=%d dBm\n",
rxlev2dbm(av_rxlev)); rxlev2dbm(av_rxlev));
return attempt_handover(mr); attempt_handover(mr);
return;
} }
/* Bad Quality */ /* Bad Quality */
if (meas_rep_n_out_of_m_be(mr->lchan, dqual, 3, 4, 5)) { if (meas_rep_n_out_of_m_be(mr->lchan, dqual, 3, 4, 5)) {
LOGPC(DHO, LOGL_INFO, "HO cause: Bad Quality av_rxlev=%d dBm\n", rxlev2dbm(av_rxlev)); LOGPC(DHO, LOGL_INFO, "HO cause: Bad Quality av_rxlev=%d dBm\n", rxlev2dbm(av_rxlev));
return attempt_handover(mr); attempt_handover(mr);
return;
} }
/* Low Level */ /* Low Level */
if (rxlev2dbm(av_rxlev) <= -110) { if (rxlev2dbm(av_rxlev) <= -110) {
LOGPC(DHO, LOGL_INFO, "HO cause: Low Level av_rxlev=%d dBm\n", rxlev2dbm(av_rxlev)); LOGPC(DHO, LOGL_INFO, "HO cause: Low Level av_rxlev=%d dBm\n", rxlev2dbm(av_rxlev));
return attempt_handover(mr); attempt_handover(mr);
return;
} }
/* Distance */ /* Distance */
if (mr->ms_l1.ta > ho_get_hodec1_max_distance(bts->ho)) { if (mr->ms_l1.ta > ho_get_hodec1_max_distance(bts->ho)) {
LOGPC(DHO, LOGL_INFO, "HO cause: Distance av_rxlev=%d dBm ta=%d \n", LOGPC(DHO, LOGL_INFO, "HO cause: Distance av_rxlev=%d dBm ta=%d \n",
rxlev2dbm(av_rxlev), mr->ms_l1.ta); rxlev2dbm(av_rxlev), mr->ms_l1.ta);
return attempt_handover(mr); attempt_handover(mr);
return;
} }
/* Power Budget AKA Better Cell */ /* Power Budget AKA Better Cell */
@ -325,10 +329,7 @@ static int process_meas_rep(struct gsm_meas_rep *mr)
* assert non-zero to clarify. */ * assert non-zero to clarify. */
OSMO_ASSERT(pwr_interval); OSMO_ASSERT(pwr_interval);
if ((mr->nr % pwr_interval) == pwr_interval - 1) if ((mr->nr % pwr_interval) == pwr_interval - 1)
return attempt_handover(mr); attempt_handover(mr);
return 0;
} }
static int ho_dec_sig_cb(unsigned int subsys, unsigned int signal, static int ho_dec_sig_cb(unsigned int subsys, unsigned int signal,