Update from current NetBSD version of ieee80211_radiotap.h.

[tcpdump] / print-lane.c

diff --git a/print-lane.c b/print-lane.c
index 03e5652d10f738249f4499cc8450cb4095efd273..e775f1fcf75b607ff790101b7e352c4b0a6927fd 100644 (file)
--- a/print-lane.c
+++ b/print-lane.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.23 2004-03-17 23:24:37 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.23.2.2 2005-11-13 12:12:59 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -134,7 +134,6 @@ lane_print(const u_char *p, u_int length, u_int caplen)
        /*
         * Is it (gag) an 802.3 encapsulation?
         */
        /*
         * Is it (gag) an 802.3 encapsulation?
         */

-       extracted_ethertype = 0;

        if (ether_type <= ETHERMTU) {
                /* Try to print the LLC-layer header & higher layers */
                if (llc_print(p, length, caplen, ep->h_source, ep->h_dest,
        if (ether_type <= ETHERMTU) {
                /* Try to print the LLC-layer header & higher layers */
                if (llc_print(p, length, caplen, ep->h_source, ep->h_dest,


@@ -146,7 +145,7 @@ lane_print(const u_char *p, u_int length, u_int caplen)
                                printf("(LLC %s) ",
                               etherproto_string(htons(extracted_ethertype)));
                        }
                                printf("(LLC %s) ",
                               etherproto_string(htons(extracted_ethertype)));
                        }

-                       if (!xflag && !qflag)
+                       if (!suppress_default_print)

                                default_print(p, caplen);
                }
        } else if (ether_encap_print(ether_type, p, length, caplen,
                                default_print(p, caplen);
                }
        } else if (ether_encap_print(ether_type, p, length, caplen,


@@ -154,7 +153,7 @@ lane_print(const u_char *p, u_int length, u_int caplen)
                /* ether_type not known, print raw packet */
                if (!eflag)
                        lane_hdr_print((u_char *)ep, length + sizeof(*ep));
                /* ether_type not known, print raw packet */
                if (!eflag)
                        lane_hdr_print((u_char *)ep, length + sizeof(*ep));

-               if (!xflag && !qflag)
+               if (!suppress_default_print)

                        default_print(p, caplen);
        }
 }
                        default_print(p, caplen);
        }
 }