diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2016-08-08 17:51:19 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2016-08-10 17:14:48 +0200 |
| commit | 2f44693fad8505255293d3ed37dbd4e7cabebd37 (patch) | |
| tree | 7bebb7bcd029a9b2bf32fd89f067eb9fd362207b | |
| parent | 158b5d2bdb3c51056283f6eb962a55762d34efa1 (diff) | |
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: Ia0f7ae5b114e179ab56b98adbae9810e81b4b88f
| -rw-r--r-- | openbsc/src/libcommon/gsm_data_shared.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/openbsc/src/libcommon/gsm_data_shared.c index 8d99ea42d..529f72cfc 100644 --- a/openbsc/src/libcommon/gsm_data_shared.c +++ b/openbsc/src/libcommon/gsm_data_shared.c @@ -592,7 +592,17 @@ uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan, 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; } |