diff options
| -rw-r--r-- | include/osmo-bts/gsm_data.h | 4 | ||||
| -rw-r--r-- | src/common/l1sap.c | 4 | ||||
| -rw-r--r-- | src/common/oml.c | 20 |
3 files changed, 22 insertions, 6 deletions
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 772a7050..c513b279 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -94,7 +94,9 @@ struct gsm_bts_role_bts { uint8_t tc4_ctr; } si; struct gsm_time gsm_time; - uint8_t radio_link_timeout; + /* Radio Link Timeout counter. -1 disables timeout for + * lab/measurement purpose */ + int radio_link_timeout; int ul_power_target; /* Uplink Rx power target */ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index fd8c54eb..b9104b70 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -809,6 +809,10 @@ static void radio_link_timeout(struct gsm_lchan *lchan, int bad_frame) { struct gsm_bts_role_bts *btsb = lchan->ts->trx->bts->role; + /* Bypass radio link timeout if set to -1 */ + if (btsb->radio_link_timeout < 0) + return; + /* if link loss criterion already reached */ if (lchan->s == 0) { DEBUGP(DMEAS, "%s radio link counter S already 0.\n", diff --git a/src/common/oml.c b/src/common/oml.c index 982713e6..fe35e856 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -627,17 +627,27 @@ static int oml_rx_set_bts_attr(struct gsm_bts *bts, struct msgb *msg) if (TLVP_PRES_LEN(&tp, NM_ATT_CONN_FAIL_CRIT, 1)) { const uint8_t *val = TLVP_VAL(&tp, NM_ATT_CONN_FAIL_CRIT); - if (TLVP_LEN(&tp, NM_ATT_CONN_FAIL_CRIT) < 2 - || val[0] != 0x01 || val[1] < 4 || val[1] > 64) { + switch (val[0]) { + case 0xFF: /* Osmocom specific Extension of TS 12.21 */ + LOGP(DOML, LOGL_NOTICE, "WARNING: Radio Link Timeout " + "explicitly disabled, only use this for lab testing!\n"); + btsb->radio_link_timeout = -1; + break; + case 0x01: /* Based on uplink SACCH (radio link timeout) */ + if (TLVP_LEN(&tp, NM_ATT_CONN_FAIL_CRIT) >= 2 && + val[1] >= 4 && val[1] <= 64) { + btsb->radio_link_timeout = val[1]; + break; + } + /* fall-through */ + case 0x02: /* Based on RXLEV/RXQUAL measurements */ + default: LOGP(DOML, LOGL_NOTICE, "Given Conn. Failure Criterion " "not supported. Please use critetion 0x01 with " "RADIO_LINK_TIMEOUT value of 4..64\n"); return oml_fom_ack_nack(msg, NM_NACK_PARAM_RANGE); } - btsb->radio_link_timeout = val[1]; } - /* if val[0] != 0x01: can be 'operator dependent' and needs to - * be parsed by bts driver */ /* 9.4.53 T200 */ if (TLVP_PRES_LEN(&tp, NM_ATT_T200, ARRAY_SIZE(btsb->t200_ms))) { |