[PATCH] openbsc[master]: gsm_pchan2chan_nr: disable a chan_nr assert in BTS, to not b...

[Neels Hofmeyr]

Hello Max,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/665

to look at the new patch set (#3).

gsm_pchan2chan_nr: disable a chan_nr assert in BTS, to not break octphy

In https://gerrit.osmocom.org/589 , msuraev reports an assertion on octphy.
So disable this recently added assertion until we clarify the invocation in
question.

Change-Id: I05253343d5bcc7b319444376098dc8561dd83944
---
M openbsc/src/libcommon/gsm_data_shared.c
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/65/665/3

diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/openbsc/src/libcommon/gsm_data_shared.c
index 8d99ea4..529f72c 100644
--- a/openbsc/src/libcommon/gsm_data_shared.c
+++ b/openbsc/src/libcommon/gsm_data_shared.c
@@ -592,7 +592,17 @@
 		break;
 	default:
 	case GSM_PCHAN_CCCH:
+#ifdef ROLE_BSC
 		OSMO_ASSERT(lchan_nr == 0);
+#else
+		/*
+		 * FIXME: On octphy and litecell, we hit above assertion (see
+		 * Max's comment at https://gerrit.osmocom.org/589 ); disabled
+		 * for BTS until this is clarified; remove the #ifdef when it
+		 * is fixed.
+		 */
+#warning "fix caller that passes lchan_nr != 0"
+#endif
 		cbits = 0x10;
 		break;
 	}

-- 
To view, visit https://gerrit.osmocom.org/665
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I05253343d5bcc7b319444376098dc8561dd83944
Gerrit-PatchSet: 3
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: neels_test_account <neels at hofmeyr.de>