summaryrefslogtreecommitdiff
path: root/zebra/interface.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-05-18 09:45:57 -0400
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-05-18 09:45:57 -0400
commitac139b5fb6f0a9f14ced54b9b7dcee9d2e98558e (patch)
tree049c46521cea65946eb15b198f5ea0da9c015212 /zebra/interface.c
parent25c58d6d2bbec1de1ab21d76f8bd2cd6cd65df0b (diff)
parent69b174d4ec7d347054761d4ddcddba096c9c4ece (diff)
Merge remote-tracking branch 'origin/master' into pim_crash_a_boo
Diffstat (limited to 'zebra/interface.c')
-rw-r--r--zebra/interface.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/zebra/interface.c b/zebra/interface.c
index 7ff782f7cc..7b0d31338d 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -709,6 +709,10 @@ if_delete_update (struct interface *ifp)
interface deletion message. */
ifp->ifindex = IFINDEX_INTERNAL;
ifp->node = NULL;
+
+ /* if the ifp is in a vrf, move it to default so vrf can be deleted if desired */
+ if (ifp->vrf_id)
+ if_handle_vrf_change (ifp, VRF_DEFAULT);
}
/* VRF change for an interface */