From: Vincent Bernat <bernat@luffy.cx>
Date: Sun, 30 Dec 2012 10:05:55 +0000 (+0100)
Subject: lldpd: cleanup phase is done in `update_local_ports()`
X-Git-Tag: 0.7.0~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfdc2a8c2b08bce8cde7fcee75587fc7a6871172;p=thirdparty%2Flldpd.git

lldpd: cleanup phase is done in `update_local_ports()`

Cleaning up unused ports and chassis is really part of updating local
ports process.
---

diff --git a/src/daemon/lldpd.c b/src/daemon/lldpd.c
index 00ff4f7e..53bec842 100644
--- a/src/daemon/lldpd.c
+++ b/src/daemon/lldpd.c
@@ -911,6 +911,7 @@ lldpd_update_localports(struct lldpd *cfg)
 	    hardware->h_flags = 0;
 
 	interfaces_update(cfg);
+	lldpd_cleanup(cfg);
 }
 
 void
@@ -927,8 +928,6 @@ lldpd_loop(struct lldpd *cfg)
 	LOCAL_CHASSIS(cfg)->c_cap_enabled = 0;
 	log_debug("loop", "update information for local ports");
 	lldpd_update_localports(cfg);
-	log_debug("loop", "cleanup pass");
-	lldpd_cleanup(cfg);
 	log_debug("loop", "update information for local chassis");
 	lldpd_update_localchassis(cfg);
 	log_debug("loop", "send appropriate PDU on all interfaces");