update change log: add support for LACP, MARKER as per 802.3ad

[tcpdump] / llc.h

diff --git a/llc.h b/llc.h
index 2861ec8fedc5a3198c688e0632453343747a2f0c..c97975501ff231de36d952cf52c0bbaded008eb6 100644 (file)
--- a/llc.h
+++ b/llc.h
@@ -18,44 +18,13 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.15 2002-11-09 17:19:21 itojun Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.18 2005-04-26 07:26:33 guy Exp $ (LBL)
  */
 
 /*
- * This stuff should come from a system header file, but there's no
- * obviously portable way to do that and it's not really going
- * to change from system to system.
+ * Definitions for information in the LLC header.
  */
 
-/*
- * A somewhat abstracted view of the LLC header
- */
-
-struct llc {
-       u_int8_t dsap;
-       u_int8_t ssap;
-       union {
-               u_int8_t u_ctl;
-               u_int16_t is_ctl;
-               struct {
-                       u_int8_t snap_ui;
-                       u_int8_t snap_pi[5];
-               } snap;
-               struct {
-                       u_int8_t snap_ui;
-                       u_int8_t snap_orgcode[3];
-                       u_int8_t snap_ethertype[2];
-               } snap_ether;
-       } ctl;
-} __attribute__((packed));
-
-#define        llcui           ctl.snap.snap_ui
-#define        llcpi           ctl.snap.snap_pi
-#define        llc_orgcode     ctl.snap_ether.snap_orgcode
-#define        llc_ethertype   ctl.snap_ether.snap_ethertype
-#define        llcis           ctl.is_ctl
-#define        llcu            ctl.u_ctl
-
 #define        LLC_U_FMT       3
 #define        LLC_GSAP        1
 #define LLC_S_FMT      1
@@ -125,12 +94,6 @@ struct llc {
 #define        LLCSAP_ISONS            0xfe
 #endif
 
-#define        OUI_ENCAP_ETHER 0x000000        /* encapsulated Ethernet */
-#define        OUI_CISCO       0x00000c        /* Cisco protocols */
-#define        OUI_CISCO_90    0x0000f8        /* Cisco bridging */
-#define OUI_RFC2684    0x0080c2        /* RFC 2684 bridged Ethernet */
-#define        OUI_APPLETALK   0x080007        /* Appletalk */
-
 /*
  * PIDs for use with OUI_CISCO.
  */
@@ -150,4 +113,3 @@ struct llc {
 #define PID_RFC2684_802_6_FCS  0x0005  /* 802.6, with FCS */
 #define PID_RFC2684_802_6_NOFCS        0x000b  /* 802.6, without FCS */
 #define PID_RFC2684_BPDU       0x000e  /* BPDUs */
-