fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31680 )
Change subject: osmo-bts-{trx,virtual}: set rc on error in bts_model_l1sap_down() ......................................................................
osmo-bts-{trx,virtual}: set rc on error in bts_model_l1sap_down()
Change-Id: If3016bae9d03a9972c04b748fc9efab56a412e0e Related: OS#1572 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/l1_if.c 2 files changed, 14 insertions(+), 0 deletions(-)
Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 7652117..2b0c723 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -420,6 +420,7 @@ if ((chan_nr & 0xE0) == 0x80) { LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Cannot activate" " channel %s\n", rsl_chan_nr_str(chan_nr)); + rc = -EPERM; break; }
@@ -480,6 +481,7 @@ if ((chan_nr & 0xE0) == 0x80) { LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Cannot deactivate" " channel %s\n", rsl_chan_nr_str(chan_nr)); + rc = -EPERM; break; } /* clear ECU state (if any) */ diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index 235c399..b578ca0 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -375,6 +375,7 @@ if ((chan_nr & 0xE0) == 0x80) { LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Cannot activate" " channel %s\n", rsl_chan_nr_str(chan_nr)); + rc = -EPERM; break; } /* activate dedicated channel */ @@ -420,6 +421,7 @@ if ((chan_nr & 0xE0) == 0x80) { LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Cannot deactivate" " channel %s\n", rsl_chan_nr_str(chan_nr)); + rc = -EPERM; break; } /* deactivate associated channel */