Change in osmo-bsc[master]: nm_channel_fsm: drop ipa link if SetChannelAttr fails

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25710 )

Change subject: nm_channel_fsm: drop ipa link if SetChannelAttr fails
......................................................................

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
---
M src/osmo-bsc/nm_channel_fsm.c
1 file changed, 2 insertions(+), 10 deletions(-)

Approvals:
  osmith: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c
index 31b8c03..52ff437 100644
--- a/src/osmo-bsc/nm_channel_fsm.c
+++ b/src/osmo-bsc/nm_channel_fsm.c
@@ -95,16 +95,8 @@
 	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) {

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25710
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Id4c724ef17beae4bb0918ebd1a809665b59e4861
Gerrit-Change-Number: 25710
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211007/da75fc31/attachment.htm>