Merge pull request #2944 from thbtcllt/master

[mirror_frr.git] / zebra / interface.c

diff --git a/zebra/interface.c b/zebra/interface.c
index 48adfd5a3d2e5b26abcc06b428ceac1a7b15d6ea..0c9e21d06893f4011ef40677bb98ea03087a47be 100644 (file)
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -981,13 +981,16 @@ void if_refresh(struct interface *ifp)
        if_get_flags(ifp);
 }
 
-void zebra_if_update_link(struct interface *ifp, ifindex_t link_ifindex)
+void zebra_if_update_link(struct interface *ifp, ifindex_t link_ifindex,
+                         ns_id_t ns_id)
 {
        struct zebra_if *zif;
 
+       if (IS_ZEBRA_IF_VETH(ifp))
+               return;
        zif = (struct zebra_if *)ifp->info;
        zif->link_ifindex = link_ifindex;
-       zif->link = if_lookup_by_index_per_ns(zebra_ns_lookup(NS_DEFAULT),
+       zif->link = if_lookup_by_index_per_ns(zebra_ns_lookup(ns_id),
                                              link_ifindex);
 }
 
@@ -1072,6 +1075,10 @@ static const char *zebra_ziftype_2str(zebra_iftype_t zif_type)
                return "VRF";
                break;
 
+       case ZEBRA_IF_VETH:
+               return "VETH";
+               break;
+
        default:
                return "Unknown";
                break;