diff options
| author | Harald Welte <laforge@gnumonks.org> | 2021-10-23 01:24:50 +0300 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-10-23 01:42:45 +0300 |
| commit | 991020c049c63768e147d49bd2918c2d2e0f6dcb (patch) | |
| tree | f3cf294181149bb90c22b9327ffeba3f5e0b7a11 | |
| parent | 184fcb80106aac54961c9c8c98f6fde316a68be9 (diff) | |
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
| -rw-r--r-- | src/common/rsl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/common/rsl.c b/src/common/rsl.c index a0afc306..e8f9aa0d 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3569,6 +3569,15 @@ int lapdm_rll_tx_cb(struct msgb *msg, struct lapdm_entity *le, void *ctx) 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 @@ int lapdm_rll_tx_cb(struct msgb *msg, struct lapdm_entity *le, void *ctx) 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); } } |