From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 5 May 2016 12:20:32 +0000 (-0400)
Subject: lib: Vrf disable hook was never being run
X-Git-Tag: frr-2.0-rc1~933
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a647bfa8d7e4d15ba062266e213887ddc0a719e5;p=matthieu%2Ffrr.git

lib: Vrf disable hook was never being run

The check for the fact a vrf was enabled
was immediately after we disabled it in vrf_disable()

Ticket: CM-10139
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
---

diff --git a/lib/vrf.c b/lib/vrf.c
index bc82ea9d8a..9615ecfab6 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -349,9 +349,10 @@ vrf_enable (struct vrf *vrf)
 static void
 vrf_disable (struct vrf *vrf)
 {
-  UNSET_FLAG (vrf->status, VRF_ACTIVE);
   if (vrf_is_enabled (vrf))
     {
+      UNSET_FLAG (vrf->status, VRF_ACTIVE);
+
       if (debug_vrf)
 	zlog_debug ("VRF %u is to be disabled.", vrf->vrf_id);