aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/libpcap.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2005-07-22 15:55:06 +0000
committerAnders Broman <anders.broman@ericsson.com>2005-07-22 15:55:06 +0000
commitbd12fbef7fd07f1f858e9314419486899e4d54aa (patch)
tree928e581edaf333bc08ddde006d48368ecfa3782b /wiretap/libpcap.c
parent5800e255efcd72aaa92031bd3936895a2a0fefc0 (diff)
From Hannes Gredler:
support for support for DLT_JUNIPER_MLPPP svn path=/trunk/; revision=14994
Diffstat (limited to 'wiretap/libpcap.c')
-rw-r--r--wiretap/libpcap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 97c14fcf78..b6136d2398 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -307,9 +307,9 @@ static const struct {
{ 127, WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP }, /* 802.11 plus radiotap WLAN header */
{ 128, WTAP_ENCAP_TZSP }, /* Tazmen Sniffer Protocol */
{ 129, WTAP_ENCAP_ARCNET_LINUX },
-
+ { 130, WTAP_ENCAP_JUNIPER_MLPPP }, /* Juniper MLPPP on ML-, LS-, AS- PICs */
/*
- * Values 130 through 137 not listed here are reserved for use
+ * Values 131-134, 136 not listed here are reserved for use
* in Juniper hardware.
*/
{ 135, WTAP_ENCAP_JUNIPER_ATM2 }, /* various encapsulations captured on the ATM2 PIC */