Add changes in 4.2.1.

[tcpdump] / print-fr.c

diff --git a/print-fr.c b/print-fr.c
index f71aee665273494bbca4fd07dc356f2c72a97f09..51263066a77efeac3b08a17630d6e07b6dd96b5e 100644 (file)
--- a/print-fr.c
+++ b/print-fr.c
@@ -256,11 +256,10 @@ fr_print(register const u_char *p, u_int length)
                 if (eflag)
                     fr_hdr_print(length, addr_len, dlci, flags, extracted_ethertype);
 
-                if (ether_encap_print(extracted_ethertype,
+                if (ethertype_print(gndo, extracted_ethertype,
                                       p+addr_len+ETHERTYPE_LEN,
                                       length-addr_len-ETHERTYPE_LEN,
-                                      length-addr_len-ETHERTYPE_LEN,
-                                      &extracted_ethertype) == 0)
+                                      length-addr_len-ETHERTYPE_LEN) == 0)
                     /* ether_type not known, probably it wasn't one */
                     printf("UI %02x! ", p[addr_len]);
                 else
@@ -287,7 +286,7 @@ fr_print(register const u_char *p, u_int length)
 
 #ifdef INET6
        case NLPID_IP6:
-               ip6_print(p, length);
+               ip6_print(gndo, p, length);
                break;
 #endif
        case NLPID_CLNP:
@@ -297,7 +296,7 @@ fr_print(register const u_char *p, u_int length)
                break;
 
        case NLPID_SNAP:
-               if (snap_print(p, length, length, &extracted_ethertype, 0) == 0) {
+               if (snap_print(p, length, length, 0) == 0) {
                        /* ether_type not known, print raw packet */
                         if (!eflag)
                             fr_hdr_print(length + hdr_len, hdr_len,