CHANGES: Add a change backported to 4.99

[tcpdump] / print-lldp.c

diff --git a/print-lldp.c b/print-lldp.c
index 461b82f468177672b83bb519f9ab8faa98a3af40..c12e37d037275431478c438845beec293bcb4425 100644 (file)
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -19,9 +19,7 @@
 
 /* \summary: IEEE 802.1ab Link Layer Discovery Protocol (LLDP) printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -1088,7 +1086,7 @@ lldp_private_tia_print(netdissect_options *ndo,
             tptr = tptr + 9;
 
             /* Decode each civic address element */
-            while (lci_len > 0) {
+            while (lci_len != 0) {
                 if (lci_len < 2) {
                     return hexdump;
                 }
@@ -1098,7 +1096,7 @@ lldp_private_tia_print(netdissect_options *ndo,
                tptr += 2;
                 lci_len -= 2;
 
-                ND_PRINT("\n\t      CA type \'%s\' (%u), length %u: ",
+                ND_PRINT("\n\t      CA type '%s' (%u), length %u: ",
                        tok2str(lldp_tia_location_lci_catype_values, "unknown", ca_type),
                        ca_type, ca_len);