[S] Change in osmo-bts[master]: lc15,oc2g,sysmo: Update GPRS NM object state at the right time
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32209 )
Change subject: lc15,oc2g,sysmo: Update GPRS NM object state at the right time ......................................................................
lc15,oc2g,sysmo: Update GPRS NM object state at the right time
Change-Id: I2f331954835496504f1fafa572bd46ee83b03a63 --- M src/osmo-bts-lc15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-sysmo/oml.c 3 files changed, 12 insertions(+), 17 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/09/32209/1
diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c index 9a73513..da2f348 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -1889,14 +1889,8 @@ 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 553ef53..6809133 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -1878,10 +1878,6 @@ 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; @@ -1898,7 +1894,7 @@ 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 a00cb93..3954244 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1754,10 +1754,6 @@ 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; @@ -1774,7 +1770,7 @@ 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:
-
pespin