From 865c8d5c44bf1ae6b32ad0ee44ad4bc16880b476 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 2 Mar 2020 20:29:01 -0500 Subject: [PATCH] ldpd: Remove double set of lif 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 --- ldpd/ldpd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index 13de48fd70..7ab8d56f24 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -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; -- 2.39.5