]> git.proxmox.com Git - mirror_frr.git/commitdiff
ldpd: Remove double set of lif
authorDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 3 Mar 2020 01:29:01 +0000 (20:29 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 3 Mar 2020 01:31:15 +0000 (20:31 -0500)
The lif variable was being set in the if statement and
immediately copied into from xf.  No need to do this
twice.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
ldpd/ldpd.c

index 13de48fd705dcfd99551fc63568e2f369ccd2dda..7ab8d56f244a76bfc47d29090336e2ad394b0e9c 100644 (file)
@@ -1688,7 +1688,7 @@ merge_l2vpn(struct ldpd_conf *xconf, struct l2vpn *l2vpn, struct l2vpn *xl)
        }
        RB_FOREACH_SAFE(xf, l2vpn_if_head, &xl->if_tree, ftmp) {
                /* find new interfaces */
-               if ((lif = l2vpn_if_find(l2vpn, xf->ifname)) == NULL) {
+               if (l2vpn_if_find(l2vpn, xf->ifname) == NULL) {
                        COPY(lif, xf);
                        RB_INSERT(l2vpn_if_head, &l2vpn->if_tree, lif);
                        lif->l2vpn = l2vpn;