Apple IPoIEEE1394: Use a GET_LINKADDR_STRING() call

[tcpdump] / print-ap1394.c

diff --git a/print-ap1394.c b/print-ap1394.c
index 8cc22fe83215ee8b2ec69c804bb706d2b23b7295..8e6454dd0ee38f18963d93056c0544ad917a83ce 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -52,7 +52,7 @@ struct firewire_header {
 static const char *
 fwaddr_string(netdissect_options *ndo, const u_char *addr)
 {
-       return (linkaddr_string(ndo, addr, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN));
+       return GET_LINKADDR_STRING(addr, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN);
 }
 
 static void
@@ -96,11 +96,11 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 
        ndo->ndo_protocol = "ap1394";
        if (caplen < FIREWIRE_HDRLEN) {
-               ndo->ndo_ll_header_length += caplen;
+               ndo->ndo_ll_hdr_len += caplen;
                nd_print_trunc(ndo);
                return;
        }
-       ndo->ndo_ll_header_length += FIREWIRE_HDRLEN;
+       ndo->ndo_ll_hdr_len += FIREWIRE_HDRLEN;
 
        if (ndo->ndo_eflag)
                ap1394_hdr_print(ndo, p, length);