From 194d1e8bc2dd7e7e111e660e856155e9673651c7 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Wed, 31 May 2023 23:08:51 +0700 Subject: [PATCH] osmo-bts-trx: remove redundant memset() on receipt of NOPE.ind In all Uplink lchan handlers we do memset() the Rx burst buffer on bid=0 and there is no need to do that again for NOPE.ind. Change-Id: Ia6803b8606d86bd2d011fe21f7a540d2115aa654 --- src/osmo-bts-trx/sched_lchan_pdtch.c | 2 -- src/osmo-bts-trx/sched_lchan_tchf.c | 3 +-- src/osmo-bts-trx/sched_lchan_tchh.c | 3 +-- src/osmo-bts-trx/sched_lchan_xcch.c | 3 +-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index 3c993f07e..f12961f50 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -88,8 +88,6 @@ int rx_pdtch_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) break; case 0: /* NOPE.ind, assume GPRS? */ - burst = bursts_p + bi->bid * 116; - memset(burst, 0, 116); n_bursts_bits = GSM0503_GPRS_BURSTS_NBITS; } diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index cadb771c2..0b709bcca 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -117,8 +117,7 @@ int rx_tchf_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) if (bi->burst_len > 0) { memcpy(burst, bi->burst + 3, 58); memcpy(burst + 58, bi->burst + 87, 58); - } else - memset(burst, 0, 116); + } /* wait until complete set of bursts */ if (bi->bid != 3) diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 77142969a..c91569fdf 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -141,8 +141,7 @@ int rx_tchh_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) if (bi->burst_len > 0) { memcpy(burst, bi->burst + 3, 58); memcpy(burst + 58, bi->burst + 87, 58); - } else - memset(burst, 0, 116); + } /* wait until complete set of bursts */ if (bi->bid != 1) diff --git a/src/osmo-bts-trx/sched_lchan_xcch.c b/src/osmo-bts-trx/sched_lchan_xcch.c index 52d80d0b0..0fccf3ecd 100644 --- a/src/osmo-bts-trx/sched_lchan_xcch.c +++ b/src/osmo-bts-trx/sched_lchan_xcch.c @@ -88,8 +88,7 @@ int rx_data_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) if (bi->burst_len > 0) { memcpy(burst, bi->burst + 3, 58); memcpy(burst + 58, bi->burst + 87, 58); - } else - memset(burst, 0, 58 * 2); + } /* wait until complete set of bursts */ if (bi->bid != 3)