aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/pcap-common.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2009-12-03 15:27:39 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2009-12-03 15:27:39 +0000
commite592902393a7fbd63ce0bd135b51ef0181168252 (patch)
tree29f8b56386a377b142f0528f3a24586c55988fe0 /wiretap/pcap-common.c
parent39f0b9efde36d57693479071eb0413a6fce593f4 (diff)
From Petr Sumbera via bug 4284:
Added support for Solaris IPNET layer From me: Some code cleanup in packet-ipnet.c Added packet-ipnet.c to CMakeFiles.txt Added WTAP_ENCAP_IPNET to encap_table_base[] svn path=/trunk/; revision=31159
Diffstat (limited to 'wiretap/pcap-common.c')
-rw-r--r--wiretap/pcap-common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index a7b830cbd2..235bc6d802 100644
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -353,6 +353,8 @@ static const struct {
{ 224, WTAP_ENCAP_FIBRE_CHANNEL_FC2 },
/* Fibre Channel FC-2 frame with Delimiter */
{ 225, WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS },
+ /* Solaris DLPI */
+ { 226, WTAP_ENCAP_IPNET },
/*
* To repeat: