aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2008-04-12 09:23:35 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2008-04-12 09:23:35 +0000
commitf6bf2c9451e776146be49afdd1d61ec9b308cb00 (patch)
treea350280669db7acbaf73a43ba9d5d7cf2631a30f
parent6f0cea7ed287b2909e536c080c90941ed7b1c43d (diff)
From Mark C. Brown:
Added support for HPVM (Integrity Virtual Machines) guest AVIO (Accelerated Virtual IO) driver IGSSN and 2nd generation 10 Gigabit Ethernet adapter AD386A driver ICXGBE. svn path=/trunk/; revision=24926
-rw-r--r--epan/dissectors/packet-nettl.c7
-rw-r--r--wiretap/nettl.c2
-rw-r--r--wiretap/nettl.h2
3 files changed, 11 insertions, 0 deletions
diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c
index 9ab0b93bd0..4f7f54fe88 100644
--- a/epan/dissectors/packet-nettl.c
+++ b/epan/dissectors/packet-nettl.c
@@ -174,9 +174,15 @@ static const value_string subsystem[] = {
{ 250, "DHCPV6D" },
{ 252, "IGELAN" },
{ 253, "IETHER" },
+ { 257, "WBEMProvider-LAN" },
+ { 258, "SYSADMIN" },
+ { 264, "LVMPROVIDER" },
{ 265, "IXGBE" },
{ 267, "NS_LS_TELNET" },
{ 268, "NS_LS_SCTP" },
+ { 269, "HSSN" },
+ { 270, "IGSSN" },
+ { 271, "ICXGBE" },
{ 513, "KL_VM" },
{ 514, "KL_PKM" },
{ 515, "KL_DLKM" },
@@ -191,6 +197,7 @@ static const value_string subsystem[] = {
{ 524, "KL_NET" },
{ 525, "KL_MC" },
{ 526, "KL_DYNTUNE" },
+ { 527, "KL_KEN" },
{ 0, NULL }
};
diff --git a/wiretap/nettl.c b/wiretap/nettl.c
index efe3ff8dab..baa0df8b64 100644
--- a/wiretap/nettl.c
+++ b/wiretap/nettl.c
@@ -433,6 +433,8 @@ nettl_read_rec_header(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
case NETTL_SUBSYS_IGELAN :
case NETTL_SUBSYS_IETHER :
case NETTL_SUBSYS_IXGBE :
+ case NETTL_SUBSYS_IGSSN :
+ case NETTL_SUBSYS_ICXGBE :
case NETTL_SUBSYS_HPPB_FDDI :
case NETTL_SUBSYS_EISA_FDDI :
case NETTL_SUBSYS_PCI_FDDI :
diff --git a/wiretap/nettl.h b/wiretap/nettl.h
index 2c4f0be081..547aab24b2 100644
--- a/wiretap/nettl.h
+++ b/wiretap/nettl.h
@@ -92,6 +92,8 @@
#define NETTL_SUBSYS_IGELAN 252
#define NETTL_SUBSYS_IETHER 253
#define NETTL_SUBSYS_IXGBE 265
+#define NETTL_SUBSYS_IGSSN 270
+#define NETTL_SUBSYS_ICXGBE 271
/* FDDI cards */
#define NETTL_SUBSYS_HPPB_FDDI 95