From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 3 Mar 2020 01:29:01 +0000 (-0500)
Subject: ldpd: Remove double set of lif
X-Git-Tag: base_7.4~306^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=865c8d5c44bf1ae6b32ad0ee44ad4bc16880b476;p=matthieu%2Ffrr.git

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 <sharpd@cumulusnetworks.com>
---

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;