diff options
| author | Harald Welte <laforge@gnumonks.org> | 2016-01-18 11:23:38 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2016-02-15 14:18:59 +0100 |
| commit | fcef6b2b5200daaaedea012c352edbdbd9c8a722 (patch) | |
| tree | d1295142d9937cc796fe477adcfd9db7c28b762b /src | |
| parent | d784e50747b8cf0ce505489e1451f75be5ccbd4b (diff) | |
don't touch OML MO when PHY link is established
It seems the right thing to do: Once we know a PHY link is established,
the associated OML managed objects should change their state
accordingly. However, given all the hackery we do with MO states, this
actually breaks things, rather than helping. So I'm disabling that part
for now, but this needs to be re-visited at some point.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/bts.c | 16 | ||||
| -rw-r--r-- | src/common/phy_link.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/common/bts.c b/src/common/bts.c index 2d0ad8e8..222a82ce 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -266,19 +266,19 @@ int trx_set_available(struct gsm_bts_trx *trx, int avail) LOGP(DSUM, LOGL_INFO, "TRX(%d): Setting available = %d\n", trx->nr, avail); if (avail) { - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OK); - oml_mo_tx_sw_act_rep(&trx->mo); - oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); - oml_mo_tx_sw_act_rep(&trx->bb_transc.mo); - + /* FIXME: This needs to be sorted out */ +#if 0 + oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); + oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OFF_LINE); for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); +#endif } else { - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); - oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OFF_LINE); + oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); + oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_NOT_INSTALLED); for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) - oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); + oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); } return 0; } diff --git a/src/common/phy_link.c b/src/common/phy_link.c index 0f24b518..131fd2cb 100644 --- a/src/common/phy_link.c +++ b/src/common/phy_link.c @@ -67,7 +67,7 @@ void phy_link_state_set(struct phy_link *plink, enum phy_link_state state) LOGP(DL1C, LOGL_INFO, "trx_set_avail(1)\n"); trx_set_available(trx, 1); break; - default: + case PHY_LINK_SHUTDOWN: LOGP(DL1C, LOGL_INFO, "trx_set_avail(0)\n"); trx_set_available(trx, 0); break; |