diff options
| author | Quentin Young <qlyoung@users.noreply.github.com> | 2021-04-30 15:34:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 15:34:32 +0000 |
| commit | 1af1ce4ebc9fef96ccf37913ac83793b5005981a (patch) | |
| tree | 6824af5f36751514f9de2f31a307b4d4126086d9 /zebra/interface.c | |
| parent | 058d0236b61e53722b4974791e8e019a892959b5 (diff) | |
| parent | 357b150daec44c3309391cae921f0a284d171b43 (diff) | |
Merge pull request #8576 from pguibert6WIND/macvlan_crash
Diffstat (limited to 'zebra/interface.c')
| -rw-r--r-- | zebra/interface.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/zebra/interface.c b/zebra/interface.c index 4b708496a1..a3134d6647 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -1148,18 +1148,16 @@ void zebra_if_update_link(struct interface *ifp, ifindex_t link_ifindex, * during initial link dump kernel does not order lower devices before * upper devices so we need to fixup link dependencies at the end of dump */ -void zebra_if_update_all_links(void) +void zebra_if_update_all_links(struct zebra_ns *zns) { struct route_node *rn; struct interface *ifp; struct zebra_if *zif; - struct zebra_ns *ns; if (IS_ZEBRA_DEBUG_KERNEL) zlog_info("fixup link dependencies"); - ns = zebra_ns_lookup(NS_DEFAULT); - for (rn = route_top(ns->if_table); rn; rn = route_next(rn)) { + for (rn = route_top(zns->if_table); rn; rn = route_next(rn)) { ifp = (struct interface *)rn->info; if (!ifp) continue; @@ -1177,8 +1175,8 @@ void zebra_if_update_all_links(void) /* update SVI linkages */ if ((zif->link_ifindex != IFINDEX_INTERNAL) && !zif->link) { - zif->link = if_lookup_by_index_per_ns(ns, - zif->link_ifindex); + zif->link = if_lookup_by_index_per_ns( + zns, zif->link_ifindex); if (IS_ZEBRA_DEBUG_KERNEL) zlog_debug("interface %s/%d's lower fixup to %s/%d", ifp->name, ifp->ifindex, |