Merge pull request #14431 from idryzhov/zebra-cleanup

zebra: remove duplicated code
This commit is contained in:
Donatas Abraitis 2023-09-18 11:06:05 +03:00 committed by GitHub
commit 5ca175b387
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2051,6 +2051,8 @@ static void zebra_if_dplane_ifp_handling(struct zebra_dplane_ctx *ctx)
if_update_to_new_vrf(ifp, vrf_id);
}
zif = ifp->info;
/* Update interface information. */
set_ifindex(ifp, ifindex, zns);
ifp->flags = flags;
@ -2069,16 +2071,6 @@ static void zebra_if_dplane_ifp_handling(struct zebra_dplane_ctx *ctx)
/* Update link. */
zebra_if_update_link(ifp, link_ifindex, link_nsid);
/*
* Just set the @link/lower-device ifindex. During
* nldump interfaces are not ordered in any fashion so
* we may end up getting upper devices before lower
* devices. We will setup the real linkage once the dump
* is complete.
*/
zif = (struct zebra_if *)ifp->info;
zif->link_ifindex = link_ifindex;
ifp->ll_type = dplane_ctx_get_ifp_zltype(ctx);
interface_update_hw_addr(ctx, ifp);