laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/6966 )
Change subject: rsl: fix handling of REL IND in lapdm_rll_tx_cb()
......................................................................
rsl: fix handling of REL IND in lapdm_rll_tx_cb()
During the merge of [1] the patch hunk was applied at a slightly
wrong location, so the code path has become unreacheable.
Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726
Fixes: [1] Ie4f70c75f0137b4bd72d579b3a32575bac2fca3
---
M src/common/rsl.c
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/src/common/rsl.c b/src/common/rsl.c
index a0afc30..e8f9aa0 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -3569,6 +3569,15 @@
LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Handing RLL msg %s from
LAPDm to MEAS REP\n",
rsl_msg_name(rh->msg_type));
+ rc = handle_ms_meas_report(lchan, (struct gsm48_hdr
*)msgb_l3(msg), msgb_l3len(msg));
+ msgb_free(msg);
+ return rc;
+ } else if (rslms_is_gprs_susp_req(msg)) {
+ return handle_gprs_susp_req(msg);
+ } else {
+ LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Fwd RLL msg %s from LAPDm to
A-bis\n",
+ rsl_msg_name(rh->msg_type));
+
/* REL_IND handling */
if (rh->msg_type == RSL_MT_REL_IND &&
(lchan->type == GSM_LCHAN_TCH_F || lchan->type ==
GSM_LCHAN_TCH_H)) {
@@ -3586,15 +3595,6 @@
return 0;
}
- rc = handle_ms_meas_report(lchan, (struct gsm48_hdr
*)msgb_l3(msg), msgb_l3len(msg));
- msgb_free(msg);
- return rc;
- } else if (rslms_is_gprs_susp_req(msg)) {
- return handle_gprs_susp_req(msg);
- } else {
- LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Fwd RLL msg %s from LAPDm to
A-bis\n",
- rsl_msg_name(rh->msg_type));
-
return abis_bts_rsl_sendmsg(msg);
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/6966
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726
Gerrit-Change-Number: 6966
Gerrit-PatchSet: 7
Gerrit-Owner: laforge <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-MessageType: merged
