diff options
| author | Maria Matejka <mq@ucw.cz> | 2019-07-03 11:09:52 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2019-07-03 11:12:25 +0200 |
| commit | eac9250fd5b10809830361b94438339b3b31b270 (patch) | |
| tree | 5c9ec2591f0baa462f5572f83e4c452c3a166c95 /proto/ospf/iface.c | |
| parent | 8816b6cdd98d24535eece6b5e35730aac57cd9f7 (diff) | |
| parent | 026bfedb332d8c0dde28c693c177fe993b5df26d (diff) | |
Merge branch 'master' into mq-filter-stack
Diffstat (limited to 'proto/ospf/iface.c')
| -rw-r--r-- | proto/ospf/iface.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 388c91c8..f5c69199 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -772,6 +772,14 @@ ospf_iface_reconfigure(struct ospf_iface *ifa, struct ospf_iface_patt *new) ifa->cf = new; ifa->marked = 0; + /* Cancel GR peers if GR is disabled */ + if (!p->gr_mode && p->gr_count) + { + struct ospf_neighbor *n, *nx; + WALK_LIST_DELSAFE(n, nx, ifa->neigh_list) + if (n->gr_active) + ospf_neigh_cancel_graceful_restart(n); + } /* HELLO TIMER */ if (ifa->helloint != new->helloint) |