aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2021-01-31 18:40:54 +0100
committerlaforge <laforge@osmocom.org>2021-02-02 11:37:48 +0000
commit7fe8d71fee1fe69c86db171f73a07ea6b68fb828 (patch)
treee25c35bf1acbdcd7d271e282fe0a1d36cfeb9016 /src
parentd6cec24fa1d5ca7a9f71953a89fc31fd82121556 (diff)
ns2: Don't automatically re-start FSM at FORCE_UNCONFIGURED
There are use cases in which the NS-VC FSM should go back to unconfigured _without_ being re-started immediately. Let's permit the caller to do that. Change-Id: I31fe695a83d38ea1f10f5444e840633d7fa68442
Diffstat (limited to 'src')
-rw-r--r--src/gb/gprs_ns2_vc_fsm.c1
-rw-r--r--src/gb/gprs_ns2_vty.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index a6e49e6a..c77bc4d9 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -634,7 +634,6 @@ static void ns2_vc_fsm_allstate_action(struct osmo_fsm_inst *fi,
if (fi->state != GPRS_NS2_ST_UNCONFIGURED) {
/* Force the NSVC back to its initial state */
osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_UNCONFIGURED, 0, 0);
- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_REQ_START, NULL);
return;
}
break;
diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c
index 5d0f5c05..a3aa6ee7 100644
--- a/src/gb/gprs_ns2_vty.c
+++ b/src/gb/gprs_ns2_vty.c
@@ -1484,6 +1484,7 @@ DEFUN(show_nse, show_nse_cmd, "show ns (nsei|nsvc) <0-65535> [stats]",
static int nsvc_force_unconf_cb(struct gprs_ns2_vc *nsvc, void *ctx)
{
ns2_vc_force_unconfigured(nsvc);
+ ns2_vc_fsm_start(nsvc);
return 0;
}