]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: fix build breakage 1737/head
authormitesh <mitesh@cumulusnetworks.com>
Sat, 10 Feb 2018 00:57:37 +0000 (16:57 -0800)
committermitesh <mitesh@cumulusnetworks.com>
Sat, 10 Feb 2018 00:57:37 +0000 (16:57 -0800)
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>
zebra/zebra_vxlan.c

index a0d7fd3cb64caa6ee62586ea0cbb3ea2042c930a..c9cc556a4478f6ea520d646763c775efb6c17778 100644 (file)
@@ -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)