Rework "Update more link-layer dissectors to void functions"

[tcpdump] / print-juniper.c

diff --git a/print-juniper.c b/print-juniper.c
index 0061b2ba113319bb2c5020e119f8bb40578fc9fa..e668d0e70215f1823b8462dc7eee5e37fd2f537e 100644 (file)
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -709,7 +709,7 @@ juniper_pppoe_if_print(netdissect_options *ndo,
 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw ethernet frames */
-        ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL, FALSE);
+        ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
         ndo->ndo_ll_hdr_len += l2info.header_len;
 }
 #endif
@@ -730,8 +730,9 @@ juniper_ether_if_print(netdissect_options *ndo,
 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw Ethernet frames */
-        ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL, TRUE);
-        ndo->ndo_ll_hdr_len += l2info.header_len;
+        ndo->ndo_ll_hdr_len +=
+               l2info.header_len +
+               ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
 }
 #endif
 
@@ -1127,7 +1128,7 @@ juniper_atm2_if_print(netdissect_options *ndo,
         if (l2info.direction != JUNIPER_BPF_PKT_IN && /* ether-over-1483 encaps ? */
             /* use EXTRACT_, not GET_ (not packet buffer pointer) */
             (EXTRACT_BE_U_4(l2info.cookie) & ATM2_GAP_COUNT_MASK)) {
-            ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL, FALSE);
+            ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
             ndo->ndo_ll_hdr_len += l2info.header_len;
             return;
         }