[PATCH] osmo-bsc[master]: HO: cosmetic: handover_decision.c: make process_meas_rep() r...

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/6496

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
---
M src/libbsc/handover_decision.c
1 file changed, 12 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/6496/1

diff --git a/src/libbsc/handover_decision.c b/src/libbsc/handover_decision.c
index e394d15..e677b1f 100644
--- a/src/libbsc/handover_decision.c
+++ b/src/libbsc/handover_decision.c
@@ -257,7 +257,7 @@
 
 /* process an already parsed measurement report and decide if we want to
  * 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;
 	enum meas_rep_field dlev, dqual;
@@ -266,7 +266,7 @@
 
 	/* If this cell does not use handover algorithm 1, then we're not responsible. */
 	if (ho_get_algorithm(bts->ho) != 1)
-		return 0;
+		return;
 
 	/* we currently only do handover for TCH channels */
 	switch (mr->lchan->type) {
@@ -274,7 +274,7 @@
 	case GSM_LCHAN_TCH_H:
 		break;
 	default:
-		return 0;
+		return;
 	}
 
 	if (mr->flags & MEAS_REP_F_DL_DTX) {
@@ -297,26 +297,30 @@
 	    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",
 		      rxlev2dbm(av_rxlev));
-		return attempt_handover(mr);
+		attempt_handover(mr);
+		return;
 	}
 
 	/* Bad Quality */
 	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));
-		return attempt_handover(mr);
+		attempt_handover(mr);
+		return;
 	}
 
 	/* Low Level */
 	if (rxlev2dbm(av_rxlev) <= -110) {
 		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 */
 	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",
 					rxlev2dbm(av_rxlev), mr->ms_l1.ta);
-		return attempt_handover(mr);
+		attempt_handover(mr);
+		return;
 	}
 
 	/* Power Budget AKA Better Cell */
@@ -325,10 +329,7 @@
 	 * assert non-zero to clarify. */
 	OSMO_ASSERT(pwr_interval);
 	if ((mr->nr % pwr_interval) == pwr_interval - 1)
-		return attempt_handover(mr);
-
-	return 0;
-
+		attempt_handover(mr);
 }
 
 static int ho_dec_sig_cb(unsigned int subsys, unsigned int signal,

-- 
To view, visit https://gerrit.osmocom.org/6496
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id455a8becbb43884e8205d87b0371b216d0119fc
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>