summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Ryzhov <iryzhov@nfware.com>2023-09-17 21:34:51 +0200
committerIgor Ryzhov <iryzhov@nfware.com>2023-09-17 21:54:17 +0200
commit0f4d8c0f870dc7276c0a5e4ef9e60f4ba55b88a7 (patch)
treef556247f96df961ec1c9f785a15e262d1618fcbb
parentMerge pull request #14417 from Jafaral/veth (diff)
downloadfrr-0f4d8c0f870dc7276c0a5e4ef9e60f4ba55b88a7.tar.xz
frr-0f4d8c0f870dc7276c0a5e4ef9e60f4ba55b88a7.zip
zebra: remove duplicated code
The same thing is done in zebra_if_update_link a couple of lines above. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
-rw-r--r--zebra/interface.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/zebra/interface.c b/zebra/interface.c
index 9570391c9..92ae8a9dc 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -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);