diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-04-29 21:02:08 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-04-29 21:02:12 +0200 |
| commit | 20331ae5f6dbb545f2239dccd726a4d3ce3dcc59 (patch) | |
| tree | ca146846a6bb9b93890c85b4e03927fd9eeb6563 | |
| parent | 3301cc900ef33b60c87d236eac07a6a82433fadb (diff) | |
pdch: Avoid sending GSMTAP_CHANNEL_UNKOWN for rejected UL EGPRS data block
Even if we don't accept it, let's submit GSMTAP with correct channel.
We don't return error like in code below, because otherwise the generic
UNKNOWN gsmtap message will be sent.
Change-Id: I853679ce8907d46fcb84ae4127335c10623f09c9
| -rw-r--r-- | src/pdch.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pdch.cpp b/src/pdch.cpp index f46acc87..77be1b50 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -793,14 +793,14 @@ int gprs_rlcmac_pdch::rcv_data_block(uint8_t *data, uint8_t data_len, uint32_t f * control blocks (see 44.060, section 10.3, 1st par.) */ if (mcs_is_edge(cs)) { + bts()->send_gsmtap(PCU_GSMTAP_C_UL_DATA_EGPRS, true, trx_no(), ts_no, GSMTAP_CHANNEL_PDTCH, fn, + data, data_len); if (!bts()->bts_data()->egprs_enabled) { LOGP(DRLCMACUL, LOGL_ERROR, "Got %s RLC block but EGPRS is not enabled\n", mcs_name(cs)); - return -EINVAL; + return 0; } - bts()->send_gsmtap(PCU_GSMTAP_C_UL_DATA_EGPRS, true, trx_no(), ts_no, GSMTAP_CHANNEL_PDTCH, fn, - data, data_len); } else { bts()->send_gsmtap(PCU_GSMTAP_C_UL_DATA_GPRS, true, trx_no(), ts_no, GSMTAP_CHANNEL_PDTCH, fn, data, data_len); |