Change in osmo-bts[master]: measurement: pass *mr to repeated_dl_facch_active_decision()

[fixeria]

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26048 )

Change subject: measurement: pass *mr to repeated_dl_facch_active_decision()
......................................................................

measurement: pass *mr to repeated_dl_facch_active_decision()

Change-Id: Idbf5f95d632aa2270c49b351ad5561ca2182bf9a
Related: SYS#5114
---
M src/common/measurement.c
1 file changed, 3 insertions(+), 10 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved



diff --git a/src/common/measurement.c b/src/common/measurement.c
index 042f8b9..c5d60b2 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -795,9 +795,8 @@
 /* Decide if repeated FACCH should be applied or not. If RXQUAL level, that the
  * MS reports is high enough, FACCH repetition is not needed. */
 static void repeated_dl_facch_active_decision(struct gsm_lchan *lchan,
-					      const struct gsm48_hdr *gh)
+					      const struct gsm48_meas_res *meas_res)
 {
-	const struct gsm48_meas_res *meas_res;
 	uint8_t upper;
 	uint8_t lower;
 	uint8_t rxqual;
@@ -828,14 +827,8 @@
 	}
 
 	/* Parse MS measurement results */
-	if (gh == NULL)
+	if (meas_res == NULL)
 		goto out;
-	/* Check if this is a Measurement Report */
-	if (gh->proto_discr != GSM48_PDISC_RR)
-		goto out;
-	if (gh->msg_type != GSM48_MT_RR_MEAS_REP)
-		goto out;
-	meas_res = (const struct gsm48_meas_res *) gh->data;
 	if (meas_res->meas_valid != 0) /* 0 = valid */
 		goto out;
 
@@ -964,7 +957,7 @@
 	if (gh)
 		lchan_bs_pwr_ctrl(lchan, gh);
 
-	repeated_dl_facch_active_decision(lchan, gh);
+	repeated_dl_facch_active_decision(lchan, mr);
 
 	/* Reset state for next iteration */
 	lchan->tch.dtx.dl_active = false;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26048
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Idbf5f95d632aa2270c49b351ad5561ca2182bf9a
Gerrit-Change-Number: 26048
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211104/56b18dd6/attachment.htm>