osmo-bsc: bring in sync with recent NM MO changes
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_rf.c b/openbsc/src/osmo-bsc/osmo_bsc_rf.c
index 11cdffe..cd64b52 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_rf.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_rf.c
@@ -96,8 +96,8 @@
llist_for_each_entry(bts, &conn->rf->gsm_network->bts_list, list) {
struct gsm_bts_trx *trx;
llist_for_each_entry(trx, &bts->trx_list, list) {
- if (trx->nm_state.availability == NM_AVSTATE_OK &&
- trx->nm_state.operational != NM_STATE_LOCKED) {
+ if (trx->mo.nm_state.availability == NM_AVSTATE_OK &&
+ trx->mo.nm_state.operational != NM_STATE_LOCKED) {
send = RF_CMD_ON;
break;
}
@@ -120,9 +120,9 @@
continue;
llist_for_each_entry(trx, &bts->trx_list, list) {
- if (trx->nm_state.availability != NM_AVSTATE_OK ||
- trx->nm_state.operational != NM_OPSTATE_ENABLED ||
- trx->nm_state.administrative != NM_STATE_UNLOCKED) {
+ if (trx->mo.nm_state.availability != NM_AVSTATE_OK ||
+ trx->mo.nm_state.operational != NM_OPSTATE_ENABLED ||
+ trx->mo.nm_state.administrative != NM_STATE_UNLOCKED) {
LOGP(DNM, LOGL_ERROR, "RF activation failed. Starting again.\n");
ipaccess_drop_oml(bts);
break;