added IEEE 802.1 Link Layer Discovery Protocol (LLDP) to the ethertypes, but sorry, no dissector (yet?)

svn path=/trunk/; revision=13460

2 files changed, 5 insertions, 0 deletions

diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 60a058c3c0..87b0dc026f 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -93,6 +93,7 @@ const value_string etype_vals[] = {
     {ETHERTYPE_PROFINET,	"PROFInet"			},
     {ETHERTYPE_AOE,		"ATA over Ethernet"             },
     {ETHERTYPE_IEEE802_OUI_EXTENDED, "IEEE 802a OUI Extended Ethertype" },
+    {ETHERTYPE_LLDP,	"802.1 Link Layer Discovery Protocol (LLDP)" },
     /*
      * NDISWAN on Windows translates Ethernet frames from higher-level
      * protocols into PPP frames to hand to the PPP driver, and translates
diff --git a/etypes.h b/etypes.h
index 7c82bb3f4c..3cb703dd81 100644
--- a/etypes.h
+++ b/etypes.h
@@ -252,6 +252,10 @@
 #define ETHERTYPE_RSN_PREAUTH	0x88c7  /* 802.11i Pre-Authentication */
 #endif
 
+#ifndef ETHERTYPE_LLDP
+#define ETHERTYPE_LLDP	        0x88cc  /* IEEE 802.1 Link Layer Discovery Protocol (LLDP) */
+#endif
+
 #ifndef ETHERTYPE_LOOP
 #define ETHERTYPE_LOOP		0x9000 	/* used for layer 2 testing (do i see my own frames on the wire) */
 #endif