From 90616c1eba7d1ecd7858032c46177e28709620fd Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 7 Mar 2020 16:24:17 +0100 Subject: virtphy: Don't pass CBCH to L1CTL if not requested by application Doing so can create a number of warning messages in e.g. 'mobile' like <0015> lapd_core.c:1239 Unnumbered frame not allowed. (dl=0x55c632f9f220) <0015> lapd_core.c:392 sending MDL-ERROR-IND cause 12 from state LAPD_STATE_IDLE (dl=0x55c632f9f220) <0015> lapdm.c:481 sending MDL-ERROR-IND 12 <0001> gsm48_rr.c:4977 MDL-Error (cause 12) ignoring Change-Id: I2cf65be5b2f879fe940e08c9f369bc1cada7b0dd Closes: OS#4439 --- src/host/virt_phy/src/gsmtapl1_if.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/host/virt_phy/src/gsmtapl1_if.c b/src/host/virt_phy/src/gsmtapl1_if.c index 2b21c6dd..30f88ff4 100644 --- a/src/host/virt_phy/src/gsmtapl1_if.c +++ b/src/host/virt_phy/src/gsmtapl1_if.c @@ -235,10 +235,14 @@ static void l1ctl_from_virt_um(struct l1ctl_sock_client *lsc, struct msgb *msg, l1ctl_tx_data_ind(ms, msg, arfcn, link_id, chan_nr, fn, snr_db, signal_dbm, 0, 0); } break; + case GSMTAP_CHANNEL_CBCH51: + /* only pass CBCH data if the user application actually indicated that a CBCH + * is present */ + if (ms->state.serving_cell.ccch_mode != CCCH_MODE_COMBINED_CBCH) + break; case GSMTAP_CHANNEL_AGCH: case GSMTAP_CHANNEL_PCH: case GSMTAP_CHANNEL_BCCH: - case GSMTAP_CHANNEL_CBCH51: case GSMTAP_CHANNEL_CBCH52: /* save to just forward here, as upper layer ignores messages that * do not fit the current state (e.g. gsm48_rr.c:2159) */ -- cgit v1.2.3