osmo-bts-trx: rx_tch[fh]_fn(): combine rc-checking ifs

Change-Id: I7bb341867e362bf2061608ff54c3596ad209af90
---
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index 4832311..949e059 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -306,10 +306,7 @@
 		LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi,
 			BAD_DATA_MSG_FMT "\n", BAD_DATA_MSG_ARGS);
 		rc = 0;		/* this is how we signal BFI to l1sap */
-	}
-
-	/* FACCH */
-	if (rc == GSM_MACBLOCK_LEN) {
+	} else if (rc == GSM_MACBLOCK_LEN) { /* FACCH/F */
 		_sched_compose_ph_data_ind(l1ts, fn_begin, bi->chan,
 					   &tch_data[amr], GSM_MACBLOCK_LEN,
 					   ber10k,
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c
index a128320..7e494de 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -361,10 +361,7 @@
 		LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi,
 			BAD_DATA_MSG_FMT "\n", BAD_DATA_MSG_ARGS);
 		rc = 0;		/* this is how we signal BFI to l1sap */
-	}
-
-	/* FACCH */
-	if (rc == GSM_MACBLOCK_LEN) {
+	} else if (rc == GSM_MACBLOCK_LEN) { /* FACCH */
 		chan_state->ul_ongoing_facch = 1;
 		/* In order to provide an even stream of measurement reports in *speech*
 		 * mode, here we intentionally invalidate RSSI for FACCH, so that this

