Merge branch 'master' into dev-master

[mirror_frr.git] / zebra / interface.c

diff --git a/zebra/interface.c b/zebra/interface.c
index c17e408ea0e062903fb19ec91a3969228f57854d..a03b7f9615e6444412422900c98a4ea5df265a99 100644 (file)
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -873,7 +873,8 @@ void if_up(struct interface *ifp)
                link_if = ifp;
                zebra_vxlan_svi_up(ifp, link_if);
        } else if (IS_ZEBRA_IF_VLAN(ifp)) {
-               link_if = zif->link;
+               link_if = if_lookup_by_index_per_ns(zebra_ns_lookup(NS_DEFAULT),
+                                                   zif->link_ifindex);
                if (link_if)
                        zebra_vxlan_svi_up(ifp, link_if);
        }
@@ -901,7 +902,8 @@ void if_down(struct interface *ifp)
                link_if = ifp;
                zebra_vxlan_svi_down(ifp, link_if);
        } else if (IS_ZEBRA_IF_VLAN(ifp)) {
-               link_if = zif->link;
+               link_if = if_lookup_by_index_per_ns(zebra_ns_lookup(NS_DEFAULT),
+                                                   zif->link_ifindex);
                if (link_if)
                        zebra_vxlan_svi_down(ifp, link_if);
        }