Change in ...osmo-bts[master]: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bts/+/15489 )
Change subject: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
..
osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a
Fixes: CID#204005 (CID#204007), CID#204006 (CID#204004)
---
M src/osmo-bts-trx/scheduler_trx.c
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index 45fc701..8b0c761 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -1272,7 +1272,8 @@
/* If there is an ECU active on this channel, use its
output */
if (lchan->ecu_state) {
rc = osmo_ecu_frame_out(lchan->ecu_state,
tch_data);
- goto compose_l1sap;
+ if (rc >= 0) /* Otherwise we send a BFI */
+ goto compose_l1sap;
}
switch (tch_mode) {
@@ -1485,7 +1486,8 @@
/* If there is an ECU active on this channel, use its
output */
if (lchan->ecu_state) {
rc = osmo_ecu_frame_out(lchan->ecu_state,
tch_data);
- goto compose_l1sap;
+ if (rc >= 0) /* Otherwise we send a BFI */
+ goto compose_l1sap;
}
switch (tch_mode) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15489
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a
Gerrit-Change-Number: 15489
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-bts[master]: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15489 ) Change subject: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out() .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a Gerrit-Change-Number: 15489 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Sep 2019 12:19:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15489 ) Change subject: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out() .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a Gerrit-Change-Number: 15489 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 12 Sep 2019 21:02:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15489 ) Change subject: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out() .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15489/1/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/#/c/15489/1/src/osmo-bts-trx/scheduler_trx.c@1278 PS1, Line 1278: return rc; > Are you sure you want to drop the tch_ind in this case? Isn't that going to > affect the RTP clock? You're right, thanks! Fixed. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a Gerrit-Change-Number: 15489 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 12 Sep 2019 21:00:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-bts[master]: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15489 to look at the new patch set (#2). Change subject: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out() .. osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out() Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a Fixes: CID#204005 (CID#204007), CID#204006 (CID#204004) --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/15489/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a Gerrit-Change-Number: 15489 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15489 ) Change subject: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out() .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15489/1/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/#/c/15489/1/src/osmo-bts-trx/scheduler_trx.c@1278 PS1, Line 1278: return rc; Are you sure you want to drop the tch_ind in this case? Isn't that going to affect the RTP clock? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a Gerrit-Change-Number: 15489 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 12 Sep 2019 11:43:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-bts[master]: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/15489
Change subject: osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
..
osmo-bts-trx/scheduler: fix: check rc of osmo_ecu_frame_out()
Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a
Fixes: CID#204005 (CID#204007), CID#204006 (CID#204004)
---
M src/osmo-bts-trx/scheduler_trx.c
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/15489/1
diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index 45fc701..6107d2f 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -1272,6 +1272,11 @@
/* If there is an ECU active on this channel, use its
output */
if (lchan->ecu_state) {
rc = osmo_ecu_frame_out(lchan->ecu_state,
tch_data);
+ if (rc < 0) {
+ LOGL1S(DL1P, LOGL_ERROR, l1t, bi->tn,
chan, bi->fn,
+ "ECU failed to encode a frame
(rc=%d)\n", rc);
+ return rc;
+ }
goto compose_l1sap;
}
@@ -1485,6 +1490,11 @@
/* If there is an ECU active on this channel, use its
output */
if (lchan->ecu_state) {
rc = osmo_ecu_frame_out(lchan->ecu_state,
tch_data);
+ if (rc < 0) {
+ LOGL1S(DL1P, LOGL_ERROR, l1t, bi->tn,
chan, bi->fn,
+ "ECU failed to encode a frame
(rc=%d)\n", rc);
+ return rc;
+ }
goto compose_l1sap;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15489
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I32d244f5ddef46c8b8719f5ec27b7456514d407a
Gerrit-Change-Number: 15489
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
