diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2021-04-15 20:17:18 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2021-04-28 16:32:19 +0200 |
| commit | 496274b4eee9c843a68aaca8a32112665727bbba (patch) | |
| tree | bbff7e846fe0295ce8a7c2f3caafadb4bcd4abc6 /src/osmo-bsc | |
| parent | e8bb7438cb05a74a5f1a103c6d080944e761571e (diff) | |
lchan_fsm: mode modify: fix missing timeouts and error transitions
Change-Id: I6364cfb78f661f5f7473dcec488e361e6a1dc9e4
Diffstat (limited to 'src/osmo-bsc')
| -rw-r--r-- | src/osmo-bsc/lchan_fsm.c | 6 | ||||
| -rw-r--r-- | src/osmo-bsc/net_init.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index d2b717239..4eb95ff05 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -217,6 +217,8 @@ struct osmo_tdef_state_timeout lchan_fsm_timeouts[32] = { [LCHAN_ST_WAIT_BEFORE_RF_RELEASE] = { .T=3111 }, [LCHAN_ST_WAIT_RF_RELEASE_ACK] = { .T=3111 }, [LCHAN_ST_WAIT_AFTER_ERROR] = { .T=-3111 }, + [LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = { .T=-13 }, + [LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = { .T=-14 }, }; /* Transition to a state, using the T timer defined in lchan_fsm_timeouts. @@ -261,8 +263,8 @@ uint32_t lchan_fsm_on_error[34] = { [LCHAN_ST_WAIT_RF_RELEASE_ACK] = LCHAN_ST_BORKEN, [LCHAN_ST_WAIT_AFTER_ERROR] = LCHAN_ST_UNUSED, [LCHAN_ST_BORKEN] = LCHAN_ST_BORKEN, - [LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = LCHAN_ST_BORKEN, - [LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = LCHAN_ST_BORKEN, + [LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = LCHAN_ST_WAIT_RF_RELEASE_ACK, + [LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK] = LCHAN_ST_WAIT_RF_RELEASE_ACK, }; #define lchan_fail(fmt, args...) lchan_fail_to(lchan_fsm_on_error[fi->state], fmt, ## args) diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c index 478c62fe4..6d88adb3f 100644 --- a/src/osmo-bsc/net_init.c +++ b/src/osmo-bsc/net_init.c @@ -54,6 +54,8 @@ static struct osmo_tdef gsm_network_T_defs[] = { { .T=-10, .default_val=5, .desc="Timeout for fully configured MGW endpoint" }, { .T=-11, .default_val=5, .desc="Timeout for Perform Location Response from SMLC" }, { .T=-12, .default_val=5, .desc="Timeout for obtaining TA after BSSLAP TA Request" }, + { .T=-13, .default_val=5, .desc="Timeout for RR Channel Mode Modify ACK (BSC <-> MS)" }, + { .T=-14, .default_val=5, .desc="Timeout for RSL Channel Mode Modify ACK (BSC <-> BTS)" }, { .T=-3111, .default_val=4, .desc="Wait time after lchan was released in error (should be T3111 + 2s)" }, { .T=-3210, .default_val=20, .desc="After L3 Complete, wait for MSC to confirm" }, {} |