diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2023-04-04 16:20:09 +0200 |
|---|---|---|
| committer | pespin <pespin@sysmocom.de> | 2023-04-06 10:28:22 +0000 |
| commit | f4505f6caf952c5c431f542d7c56dce889caefbc (patch) | |
| tree | 767651ddcbbe21a99885e1ae843f88680a4fc903 | |
| parent | 91a1295a5a465572f13f0f08ced794b9c7709318 (diff) | |
lc15,oc2g,sysmo: Update GPRS NM object state at the right time
Change-Id: I2f331954835496504f1fafa572bd46ee83b03a63
| -rw-r--r-- | src/osmo-bts-lc15/oml.c | 8 | ||||
| -rw-r--r-- | src/osmo-bts-oc2g/oml.c | 6 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/oml.c | 6 |
3 files changed, 3 insertions, 17 deletions
diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c index 9f0be482..3b2ba79c 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -1884,14 +1884,8 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, case NM_OC_GPRS_NSE: case NM_OC_GPRS_CELL: case NM_OC_GPRS_NSVC: - oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, -1, -1); + oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1); rc = oml_mo_opstart_ack(mo); - if (mo->obj_class == NM_OC_BTS) { - oml_mo_state_chg(&bts->mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.nse.mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.cell.mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.nsvc[0].mo, -1, NM_AVSTATE_OK, -1); - } break; default: rc = oml_mo_opstart_nack(mo, NM_NACK_OBJCLASS_NOTSUPP); diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index dd4053cd..d5cb95fb 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -1873,10 +1873,6 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, break; case NM_OC_BTS: rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); - oml_mo_state_chg(&bts->mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.nse.mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.cell.mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.nsvc[0].mo, -1, NM_AVSTATE_OK, -1); break; case NM_OC_RADIO_CARRIER: trx = (struct gsm_bts_trx *) obj; @@ -1893,7 +1889,7 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, case NM_OC_GPRS_NSE: case NM_OC_GPRS_CELL: case NM_OC_GPRS_NSVC: - oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, -1, -1); + oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1); rc = oml_mo_opstart_ack(mo); break; default: diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 3d6f048d..15cee6f8 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1750,10 +1750,6 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, break; case NM_OC_BTS: rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); - oml_mo_state_chg(&bts->mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.nse.mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.cell.mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.nsvc[0].mo, -1, NM_AVSTATE_OK, -1); break; case NM_OC_RADIO_CARRIER: trx = (struct gsm_bts_trx *) obj; @@ -1770,7 +1766,7 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, case NM_OC_GPRS_NSE: case NM_OC_GPRS_CELL: case NM_OC_GPRS_NSVC: - oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, -1, -1); + oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1); rc = oml_mo_opstart_ack(mo); break; default: |