Rename EXTRACT_ macros

[tcpdump] / print-lane.c

diff --git a/print-lane.c b/print-lane.c
index b506ce30c47fc013cbac662d77733f8bdba1c889..ccc235273330dab771ae4c5ef0879b682e04328b 100644 (file)
--- a/print-lane.c
+++ b/print-lane.c
@@ -69,7 +69,7 @@ static const struct tok lecop2str[] = {
 static void
 lane_hdr_print(netdissect_options *ndo, const u_char *bp)
 {
-       ND_PRINT((ndo, "lecid:%x ", EXTRACT_BE_16BITS(bp)));
+       ND_PRINT((ndo, "lecid:%x ", EXTRACT_BE_U_2(bp)));
 }
 
 /*
@@ -91,13 +91,13 @@ lane_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
        }
 
        lec = (const struct lane_controlhdr *)p;
-       if (EXTRACT_BE_16BITS(&lec->lec_header) == 0xff00) {
+       if (EXTRACT_BE_U_2(&lec->lec_header) == 0xff00) {
                /*
                 * LE Control.
                 */
                ND_PRINT((ndo, "lec: proto %x vers %x %s",
                    lec->lec_proto, lec->lec_vers,
-                   tok2str(lecop2str, "opcode-#%u", EXTRACT_BE_16BITS(&lec->lec_opcode))));
+                   tok2str(lecop2str, "opcode-#%u", EXTRACT_BE_U_2(&lec->lec_opcode))));
                return;
        }