aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/packet-osi.c1
-rw-r--r--epan/nlpid.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c
index 19ad2b7538..6e7ea33673 100644
--- a/epan/dissectors/packet-osi.c
+++ b/epan/dissectors/packet-osi.c
@@ -440,6 +440,7 @@ const value_string nlpid_vals[] = {
{ NLPID_ISO11577, "ISO 11577" },
{ NLPID_COMPRESSED, "Data compression protocol" },
{ NLPID_IP, "IP" },
+ { NLPID_TRILL, "TRILL" },
{ NLPID_SNDCF, "SubNetwork Dependent Convergence Function"},
{ NLPID_IP6, "IPv6" },
{ NLPID_PPP, "PPP" },
diff --git a/epan/nlpid.h b/epan/nlpid.h
index af66e5ea63..e8202c5b55 100644
--- a/epan/nlpid.h
+++ b/epan/nlpid.h
@@ -47,6 +47,7 @@
#define NLPID_ISO11577 0x8d /* X.273 */
#define NLPID_IP6 0x8e
#define NLPID_COMPRESSED 0xb0 /* "Data compression protocol" */
+#define NLPID_TRILL 0xc0
#define NLPID_SNDCF 0xc1 /* "SubNetwork Dependent Convergence Function */
#define NLPID_IEEE_8021AQ 0xc1 /* IEEE 802.1aq (draft-ietf-isis-ieee-aq-05.txt); defined in context of ISIS "supported protocols" TLV */
#define NLPID_IP 0xcc