From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 16 Feb 2018 02:33:22 +0000 (-0500)
Subject: zebra: On shutdown don't count removals
X-Git-Tag: frr-5.0-dev~212^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a031a7e4c9232fc9433e51af6b67f22d9b0cd663;p=matthieu%2Ffrr.git

zebra: On shutdown don't count removals

Some of the tables are no longer stored in the zvrf
and in the zns now.  On shutdown zns is cleaned up
after vrf( and rightly so!) As such we should not
attempt to count the information if we don't have
a zvrf.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 967bc92850..b5ce17d9f8 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1150,7 +1150,8 @@ void rib_uninstall_kernel(struct route_node *rn, struct route_entry *re)
 	 */
 	hook_call(rib_update, rn, "uninstalling from kernel");
 	kernel_route_rib(rn, p, src_p, re, NULL);
-	zvrf->removals++;
+	if (zvrf)
+		zvrf->removals++;
 
 	return;
 }