diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2023-05-26 05:06:47 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2023-05-30 17:18:13 +0700 |
| commit | af81e3ae596f2abc852848b602d77476c4f37967 (patch) | |
| tree | b255e9a857349c84066f8e437697f9031dfa0b1e | |
| parent | 6f26f0060381bf5bf88f4b7204aa03db6d146d77 (diff) | |
trxcon/l1sched: do not align Tx burst transmission
This is no longer needed thanks to recent patch b0be904b.
Change-Id: Ia397cbe16f719729a814b7ef0b7035c7fe8ba165
Related: b0be904b "trxcon: do not call l1sched_prim_dequeue() at ul_bid != 0"
| -rw-r--r-- | src/host/trxcon/src/sched_lchan_pdtch.c | 9 | ||||
| -rw-r--r-- | src/host/trxcon/src/sched_lchan_tchf.c | 7 | ||||
| -rw-r--r-- | src/host/trxcon/src/sched_lchan_tchh.c | 6 | ||||
| -rw-r--r-- | src/host/trxcon/src/sched_lchan_xcch.c | 9 |
4 files changed, 6 insertions, 25 deletions
diff --git a/src/host/trxcon/src/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c index b6c3b4c8..4b5ffdf5 100644 --- a/src/host/trxcon/src/sched_lchan_pdtch.c +++ b/src/host/trxcon/src/sched_lchan_pdtch.c @@ -114,13 +114,8 @@ int tx_pdtch_fn(struct l1sched_lchan_state *lchan, mask = &lchan->tx_burst_mask; bursts_p = lchan->tx_bursts; - if (br->bid > 0) { - /* If we have encoded bursts */ - if (*mask) - goto send_burst; - else - return 0; - } + if (br->bid > 0) + goto send_burst; /* Encode payload */ rc = gsm0503_pdtch_encode(bursts_p, msgb_l2(lchan->prim), msgb_l2len(lchan->prim)); diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index f38c82a9..691ad5a5 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -224,13 +224,8 @@ int tx_tchf_fn(struct l1sched_lchan_state *lchan, mask = &lchan->tx_burst_mask; bursts_p = lchan->tx_bursts; - /* If we have encoded bursts */ - if (*mask) - goto send_burst; - - /* Wait until a first burst in period */ if (br->bid > 0) - return 0; + goto send_burst; /* Shift buffer by 4 bursts back for interleaving */ memcpy(bursts_p, bursts_p + 464, 464); diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index f3b78770..bff9b1b0 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -431,12 +431,8 @@ int tx_tchh_fn(struct l1sched_lchan_state *lchan, mask = &lchan->tx_burst_mask; bursts_p = lchan->tx_bursts; - if (br->bid > 0) { - /* Align to the first burst */ - if (*mask == 0x00) - return 0; + if (br->bid > 0) goto send_burst; - } if (*mask == 0x00) { /* Align transmission of the first FACCH/H frame */ diff --git a/src/host/trxcon/src/sched_lchan_xcch.c b/src/host/trxcon/src/sched_lchan_xcch.c index b246a172..f76d518d 100644 --- a/src/host/trxcon/src/sched_lchan_xcch.c +++ b/src/host/trxcon/src/sched_lchan_xcch.c @@ -110,13 +110,8 @@ int tx_data_fn(struct l1sched_lchan_state *lchan, mask = &lchan->tx_burst_mask; bursts_p = lchan->tx_bursts; - if (br->bid > 0) { - /* If we have encoded bursts */ - if (*mask) - goto send_burst; - else - return 0; - } + if (br->bid > 0) + goto send_burst; /* Check the prim payload length */ if (msgb_l2len(lchan->prim) != GSM_MACBLOCK_LEN) { |