Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/6966
to look at the new patch set (#5).
FIX REL_IND merge mismatch
During the merge of Change-Id: Ie4f70c75f0137b4bd72d579b3a32575bac2fca3
the patch hunk was applied at a slightly wrong location.
Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726
---
M src/common/rsl.c
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/6966/5
diff --git a/src/common/rsl.c b/src/common/rsl.c
index 9adb89a..fff2272 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -2503,6 +2503,13 @@
LOGP(DRSL, LOGL_INFO, "%s Handing RLL msg %s from LAPDm to MEAS
REP\n",
gsm_lchan_name(lchan), rsl_msg_name(rh->msg_type));
+ rc = rsl_tx_meas_res(lchan, msgb_l3(msg), msgb_l3len(msg), le);
+ msgb_free(msg);
+ return rc;
+ } else {
+ LOGP(DRSL, LOGL_INFO, "%s Fwd RLL msg %s from LAPDm to A-bis\n",
+ gsm_lchan_name(lchan), 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)) {
@@ -2518,13 +2525,6 @@
lchan->pending_rel_ind_msg = msg;
return 0;
}
-
- rc = rsl_tx_meas_res(lchan, msgb_l3(msg), msgb_l3len(msg), le);
- msgb_free(msg);
- return rc;
- } else {
- LOGP(DRSL, LOGL_INFO, "%s Fwd RLL msg %s from LAPDm to A-bis\n",
- gsm_lchan_name(lchan), rsl_msg_name(rh->msg_type));
return abis_bts_rsl_sendmsg(msg);
}
--
To view, visit https://gerrit.osmocom.org/6966
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726
Gerrit-PatchSet: 5
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
