diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-10-07 13:17:47 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-10-07 14:08:37 +0200 |
| commit | 74c15a8c8a00756a522737c101b33d6cc9d4d12e (patch) | |
| tree | 8bef6f77bdf89c5eab4a68d9d1b7dbd13e685493 | |
| parent | eb36819b4d093da0c117f89caf05aef9751eb518 (diff) | |
nm_channel_fsm: drop ipa link if SetChannelAttr fails
Now that we solved all the interdependency symbol mess, we can finally
enable call to this function.
Change-Id: Id4c724ef17beae4bb0918ebd1a809665b59e4861
| -rw-r--r-- | src/osmo-bsc/nm_channel_fsm.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c index 31b8c0372..52ff4374f 100644 --- a/src/osmo-bsc/nm_channel_fsm.c +++ b/src/osmo-bsc/nm_channel_fsm.c @@ -95,16 +95,8 @@ static void configure_loop(struct gsm_bts_trx_ts *ts, struct gsm_nm_state *state if (!ts->mo.set_attr_sent && !ts->mo.set_attr_ack_received) { ts->mo.set_attr_sent = true; ccomb = abis_nm_chcomb4pchan(ts->pchan_from_config); - if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) { - /* FIXME: using this here makes crazy lots of .o - dependencies be fulled in, ending up in - osmo_bsc_main.o which conficts due to containing its - own main() */ - LOGPFSML(ts->mo.fi, LOGL_ERROR, - "FIXME: Here OML link should br dropped, " - "something is wrong in your setup!\n"); - //ipaccess_drop_oml_deferred(trx->bts); - } + if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) + ipaccess_drop_oml_deferred(trx->bts); } if (state->administrative != NM_STATE_UNLOCKED && !ts->mo.adm_unlock_sent) { |