From 6ca1c28d9c88626b323b899e661915223563262a Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Wed, 19 May 2021 22:45:16 +0200
Subject: [PATCH] get_any_lchan(): reduce minor code dup

Change-Id: I304a7333adc265e156f04b42a10bac6912f58ad2
---
 src/osmo-bsc/abis_rsl.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c
index c430a1657..ac8006d33 100644
--- a/src/osmo-bsc/abis_rsl.c
+++ b/src/osmo-bsc/abis_rsl.c
@@ -1701,19 +1701,12 @@ static struct gsm_lchan *get_any_lchan(struct gsm_bts *bts)
 			ts = &trx->ts[ts_nr];
 			ts_for_n_lchans(lchan, ts, ts->max_primary_lchans) {
 				if (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H) {
-					if (bts->chan_alloc_reverse) {
-						if (lchan->fi->state == LCHAN_ST_ESTABLISHED)
+					if (lchan->fi->state == LCHAN_ST_ESTABLISHED) {
+						if (!lchan_est || bts->chan_alloc_reverse)
 							lchan_est = lchan;
-						else
-							lchan_any = lchan;
 					} else {
-						if (lchan->fi->state == LCHAN_ST_ESTABLISHED) {
-							if (!lchan_est)
-								lchan_est = lchan;
-						} else {
-							if (!lchan_any)
-								lchan_any = lchan;
-						}
+						if (!lchan_any || bts->chan_alloc_reverse)
+							lchan_any = lchan;
 					}
 				}
 			}