Clean up printing of LLC packets.

[tcpdump] / print-sll.c

diff --git a/print-sll.c b/print-sll.c
index 76b4e95f2ffa50a25b3f44cbb96a4ef0bf3247f8..e15afa9e44663b665eeaf6cae0df56d1236b4e59 100644 (file)
--- a/print-sll.c
+++ b/print-sll.c
@@ -197,7 +197,6 @@ sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
        u_int length = h->len;
        register const struct sll_header *sllp;
        u_short ether_type;
-       u_short extracted_ethertype;
 
        if (caplen < SLL_HDR_LEN) {
                /*
@@ -246,23 +245,15 @@ recurse:
                         * 802.2.
                         * Try to print the LLC-layer header & higher layers.
                         */
-                       if (llc_print(ndo, p, length, caplen, NULL, NULL,
-                           &extracted_ethertype) == 0)
+                       if (llc_print(ndo, p, length, caplen, NULL, NULL) == 0)
                                goto unknown;   /* unknown LLC type */
                        break;
 
                default:
-                       extracted_ethertype = 0;
                        /*FALLTHROUGH*/
 
                unknown:
                        /* ether_type not known, print raw packet */
-                       if (!ndo->ndo_eflag)
-                               sll_print(ndo, sllp, length + SLL_HDR_LEN);
-                       if (extracted_ethertype) {
-                               ND_PRINT((ndo, "(LLC %s) ",
-                              etherproto_string(htons(extracted_ethertype))));
-                       }
                        if (!ndo->ndo_suppress_default_print)
                                ND_DEFAULTPRINT(p, caplen);
                        break;