zebra: Declutter zebra_vxlan_if_add_update_vni

This function has equivalent code on both sides
of a if statement.  Let's consolidate this.

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

diff --git a/zebra/zebra_vxlan_if.c b/zebra/zebra_vxlan_if.c
index fe90b731135c12b76e885f04a0984ccef8420509..ec5d58ab08e1cd191ec365e61ef4a52a48973314 100644 (file)
--- a/zebra/zebra_vxlan_if.c
+++ b/zebra/zebra_vxlan_if.c
@@ -527,11 +527,7 @@ static int zebra_vxlan_if_add_update_vni(struct zebra_if *zif,
                                   old_vni->access_vlan, vni->vni,
                                   vni->access_vlan);
 
-               zebra_evpn_vl_vxl_deref(old_vni->access_vlan, old_vni->vni,
-                                       zif);
-               zebra_evpn_vl_vxl_ref(vni->access_vlan, vni->vni, zif);
-               zebra_vxlan_if_update_vni(zif->ifp, vni, ctx);
-               zebra_vxlan_vni_free(old_vni);
+
        } else {
                int ret;
 
@@ -544,19 +540,20 @@ static int zebra_vxlan_if_add_update_vni(struct zebra_if *zif,
                        if (IS_ZEBRA_DEBUG_VXLAN)
                                zlog_debug("%s vxlan %s vni %u has error accessing bridge table.",
                                           __func__, zif->ifp->name, vni->vni);
+
+                       return 0;
                } else if (ret == 0) {
                        if (IS_ZEBRA_DEBUG_VXLAN)
                                zlog_debug("%s vxlan %s vni (%u, %u) not present in bridge table",
-                                          __func__, zif->ifp->name, vni->vni,
-                                          vni->access_vlan);
-                       zebra_evpn_vl_vxl_deref(old_vni->access_vlan,
-                                               old_vni->vni, zif);
-                       zebra_evpn_vl_vxl_ref(vni->access_vlan, vni->vni, zif);
-                       zebra_vxlan_if_update_vni(zif->ifp, vni, ctx);
-                       zebra_vxlan_vni_free(old_vni);
+                                          __func__, zif->ifp->name, vni->vni, vni->access_vlan);
                }
        }
 
+       zebra_evpn_vl_vxl_deref(old_vni->access_vlan, old_vni->vni, zif);
+       zebra_evpn_vl_vxl_ref(vni->access_vlan, vni->vni, zif);
+       zebra_vxlan_if_update_vni(zif->ifp, vni, ctx);
+       zebra_vxlan_vni_free(old_vni);
+
        return 0;
 }