diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-04-26 14:14:37 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-04-26 14:15:08 +0200 |
| commit | 14339f6faca8a3e7db54c00c3de6ce8eb791f244 (patch) | |
| tree | 7819af900f2878d0da3289c755ea9e169f7b7d10 | |
| parent | 25ebf3c8f9bd759aaa9c57c15ec2f62cf02345b8 (diff) | |
Use negative numbers for non-spec osmo-specific timers
(values -1 and -2 cannot be used because they are already taken).
Related: OS#3928
Change-Id: Ibcdb05ff5bb8efe6cb95cf94e2c8e418dc8deced
| -rw-r--r-- | src/gprs_bssgp_pcu.c | 6 | ||||
| -rw-r--r-- | src/gprs_pcu.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index 4170a662..06e1814a 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -975,7 +975,7 @@ static void bvc_timeout(void *_priv) if (!the_pcu->bssgp.bvc_sig_reset) { LOGP(DBSSGP, LOGL_INFO, "Sending reset on BVCI 0\n"); bssgp_tx_bvc_reset(the_pcu->bssgp.bctx, 0, BSSGP_CAUSE_OML_INTERV); - secs = osmo_tdef_get(the_pcu->T_defs, 2, OSMO_TDEF_S, -1); + secs = osmo_tdef_get(the_pcu->T_defs, -102, OSMO_TDEF_S, -1); osmo_timer_schedule(&the_pcu->bssgp.bvc_timer, secs, 0); return; } @@ -984,7 +984,7 @@ static void bvc_timeout(void *_priv) LOGP(DBSSGP, LOGL_INFO, "Sending reset on BVCI %d\n", the_pcu->bssgp.bctx->bvci); bssgp_tx_bvc_reset(the_pcu->bssgp.bctx, the_pcu->bssgp.bctx->bvci, BSSGP_CAUSE_OML_INTERV); - secs = osmo_tdef_get(the_pcu->T_defs, 2, OSMO_TDEF_S, -1); + secs = osmo_tdef_get(the_pcu->T_defs, -102, OSMO_TDEF_S, -1); osmo_timer_schedule(&the_pcu->bssgp.bvc_timer, secs, 0); return; } @@ -993,7 +993,7 @@ static void bvc_timeout(void *_priv) LOGP(DBSSGP, LOGL_INFO, "Sending unblock on BVCI %d\n", the_pcu->bssgp.bctx->bvci); bssgp_tx_bvc_unblock(the_pcu->bssgp.bctx); - secs = osmo_tdef_get(the_pcu->T_defs, 1, OSMO_TDEF_S, -1); + secs = osmo_tdef_get(the_pcu->T_defs, -101, OSMO_TDEF_S, -1); osmo_timer_schedule(&the_pcu->bssgp.bvc_timer, secs, 0); return; } diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c index 52e98255..226b861c 100644 --- a/src/gprs_pcu.c +++ b/src/gprs_pcu.c @@ -30,13 +30,13 @@ struct gprs_pcu *the_pcu; static struct osmo_tdef T_defs_pcu[] = { - { .T=1, .default_val=30, .unit=OSMO_TDEF_S, .desc="BSSGP (un)blocking procedures timer (s)", .val=0 }, - { .T=2, .default_val=30, .unit=OSMO_TDEF_S, .desc="BSSGP reset procedure timer (s)", .val=0 }, { .T=3190, .default_val=5, .unit=OSMO_TDEF_S, .desc="Return to packet idle mode after Packet DL Assignment on CCCH (s)", .val=0}, { .T=PCU_TDEF_NEIGH_RESOLVE_TO, .default_val=1000, .unit=OSMO_TDEF_MS, .desc="[ARFCN+BSIC]->[RAC+CI] resolution timeout (ms)", .val=0 }, { .T=PCU_TDEF_SI_RESOLVE_TO, .default_val=1000, .unit=OSMO_TDEF_MS, .desc="RIM RAN-INFO response timeout (ms)", .val=0 }, { .T=PCU_TDEF_NEIGH_CACHE_ALIVE, .default_val=5, .unit=OSMO_TDEF_S, .desc="[ARFCN+BSIC]->[RAC+CI] resolution cache entry storage timeout (s)", .val=0 }, { .T=PCU_TDEF_SI_CACHE_ALIVE, .default_val=5, .unit=OSMO_TDEF_S, .desc="[RAC+CI]->[SI] resolution cache entry storage timeout (s)", .val=0 }, + { .T=-101, .default_val=30, .unit=OSMO_TDEF_S, .desc="BSSGP (un)blocking procedures timer (s)", .val=0 }, + { .T=-102, .default_val=30, .unit=OSMO_TDEF_S, .desc="BSSGP reset procedure timer (s)", .val=0 }, { .T=-2000, .default_val=2, .unit=OSMO_TDEF_MS, .desc="Tbf reject for PRR timer (ms)", .val=0 }, { .T=-2001, .default_val=2, .unit=OSMO_TDEF_S, .desc="PACCH assignment timer (s)", .val=0 }, { .T=-2002, .default_val=200, .unit=OSMO_TDEF_MS, .desc="Waiting after IMM.ASS confirm timer (ms)", .val=0 }, |