Change in osmo-bts[master]: trx_provision_fsm: Fix TRX!=0 never going back to CLOSED state

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25643 )


Change subject: trx_provision_fsm: Fix TRX!=0 never going back to CLOSED state
......................................................................

trx_provision_fsm: Fix TRX!=0 never going back to CLOSED state

Change-Id: I39bef8b5776cbf1098753865c597b1c99d355bec
---
M src/osmo-bts-trx/trx_provision_fsm.c
1 file changed, 4 insertions(+), 7 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/43/25643/1

diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c
index 36be76f..cdca852 100644
--- a/src/osmo-bts-trx/trx_provision_fsm.c
+++ b/src/osmo-bts-trx/trx_provision_fsm.c
@@ -560,10 +560,7 @@
 			bts_model_trx_close_cb(pinst->trx, 0);
 		} /* else: poweroff in progress, cb will be called upon TRXC RSP */
 
-		if (pinst->num == 0)
-			trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF);
-		else
-			trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWEROFF);
+		trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF);
 		break;
 	case TRX_PROV_EV_CFG_TS:
 		ts_data = (struct trx_prov_ev_cfg_ts_data*)data;
@@ -592,9 +589,10 @@
 
 			/* Notify TRX close on all TRX associated with this phy */
 			llist_for_each_entry(pinst, &plink->instances, list) {
+				l1h = pinst->u.osmotrx.hdl;
+				trx_prov_fsm_state_chg(l1h->provision_fi, TRX_PROV_ST_CLOSED);
 				bts_model_trx_close_cb(pinst->trx, rc);
 			}
-			trx_prov_fsm_state_chg(fi, TRX_PROV_ST_CLOSED);
 		}
 		break;
 	default:
@@ -646,8 +644,7 @@
 			X(TRX_PROV_EV_CLOSE) |
 			X(TRX_PROV_EV_CFG_TS),
 		.out_state_mask =
-			X(TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF) |
-			X(TRX_PROV_ST_OPEN_POWEROFF),
+			X(TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF),
 		.name = "OPEN_POWERON",
 		.onenter = st_open_poweron_on_enter,
 		.action = st_open_poweron,

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25643
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I39bef8b5776cbf1098753865c597b1c99d355bec
Gerrit-Change-Number: 25643
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210929/da43656e/attachment.htm>