From: mitesh <mitesh@cumulusnetworks.com>
Date: Sat, 10 Feb 2018 00:57:37 +0000 (-0800)
Subject: zebra: fix build breakage
X-Git-Tag: frr-5.0-dev~238^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1f2129ecd39bf3b1ae16bfb82f82131ef6ec9511;p=mirror%2Ffrr.git

zebra: fix build breakage

is_vni_l3 was removed as a part of PR1700. However, it seems to be used in master.
Causing the breakage. Made the changes to not use the API anymore.

Signed-off-by: Mitesh Kanjariya <mitesh@cumulusnetworks.com>
---

diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index a0d7fd3cb6..c9cc556a44 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -4576,6 +4576,8 @@ void zebra_vxlan_print_vni(struct vty *vty, struct zebra_vrf *zvrf, vni_t vni,
 {
 	json_object *json = NULL;
 	void *args[2];
+	zebra_l3vni_t *zl3vni = NULL;
+	zebra_vni_t *zvni = NULL;
 
 	if (!is_evpn_enabled())
 		return;
@@ -4585,22 +4587,10 @@ void zebra_vxlan_print_vni(struct vty *vty, struct zebra_vrf *zvrf, vni_t vni,
 	args[0] = vty;
 	args[1] = json;
 
-	if (is_vni_l3(vni)) {
-		zebra_l3vni_t *zl3vni = NULL;
-
-		zl3vni = zl3vni_lookup(vni);
-		if (!zl3vni) {
-			if (use_json)
-				vty_out(vty, "{}\n");
-			else
-				vty_out(vty, "%% VNI %u does not exist\n", vni);
-			return;
-		}
-
+	zl3vni = zl3vni_lookup(vni);
+	if (zl3vni) {
 		zl3vni_print(zl3vni, (void *)args);
 	} else {
-		zebra_vni_t *zvni;
-
 		zvni = zvni_lookup(vni);
 		if (!zvni) {
 			if (use_json)