fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/33731 ) Change subject: osmo-bts-trx: rx_tch[fh]_fn(): combine rc-checking ifs ...................................................................... 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/31/33731/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 3973cd0..252db56 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -240,10 +240,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 b1364a6..c8d757e 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -276,10 +276,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 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7bb341867e362bf2061608ff54c3596ad209af90 Gerrit-Change-Number: 33731 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange