From: Ben Pfaff <blp@ovn.org>
Date: Tue, 30 May 2017 14:43:47 +0000 (-0700)
Subject: ovs-lldp: Remove dead store to TTL configuration.
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9bd881f77861a8110b40de81730f9045287a58a6;p=ovs.git

ovs-lldp: Remove dead store to TTL configuration.

Apparently this has always used LLDP_CHASSIS_TTL as a fixed TTL, so we
might as well delete the statement just before that tries to dynamically
calculate it.

Found by Coverity.

Reported-at: https://scan3.coverity.com/reports.htm#v16889/p10449/fileInstanceId=14762612&defectInstanceId=4304824&mergedDefectId=180431
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Dennis Flynn <drflynn@avaya.com>
---

diff --git a/lib/ovs-lldp.c b/lib/ovs-lldp.c
index 55fc23203..711f9b4fe 100644
--- a/lib/ovs-lldp.c
+++ b/lib/ovs-lldp.c
@@ -797,8 +797,6 @@ lldp_create(const struct netdev *netdev,
     lchassis->c_id = &mac->ea[0];
 
     ovs_list_init(&lchassis->c_mgmt);
-    lchassis->c_ttl = lldp->lldpd->g_config.c_tx_interval *
-                      lldp->lldpd->g_config.c_tx_hold;
     lchassis->c_ttl = LLDP_CHASSIS_TTL;
     lldpd_assign_cfg_to_protocols(lldp->lldpd);
     ovs_list_init(&lldp->lldpd->g_chassis);