tests: Fix some tests with invalid microsecond packet timestamps

[tcpdump] / print-vqp.c

diff --git a/print-vqp.c b/print-vqp.c
index a26cd0e3274561042bbd51bd0b0e5a5569d47225..dca3c1e61d2239d277012810880d9d382625120d 100644 (file)
--- a/print-vqp.c
+++ b/print-vqp.c
@@ -17,9 +17,7 @@
 
 /* \summary: Cisco VLAN Query Protocol (VQP) printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -28,7 +26,7 @@
 #include "extract.h"
 #include "addrtoname.h"
 
-#define VQP_VERSION                            1
+#define VQP_VERSION 1
 
 /*
  * VQP common header
@@ -195,9 +193,9 @@ vqp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
             /* those objects have similar semantics - fall through */
        case VQP_OBJ_MAC_ADDRESS:
        case VQP_OBJ_MAC_NULL:
-            if (vqp_obj_len != MAC_ADDR_LEN)
+            if (vqp_obj_len != MAC48_LEN)
                 goto invalid;
-             ND_PRINT("%s", GET_ETHERADDR_STRING(tptr));
+             ND_PRINT("%s", GET_MAC48_STRING(tptr));
               break;
         default:
             if (ndo->ndo_vflag <= 1)