diff options
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap.h | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 99f1f2d34e..9d6826b27d 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -326,6 +326,8 @@ static const struct { { 181, WTAP_ENCAP_JUNIPER_CHDLC }, /* VOIP Frames prepended with meta-information */ { 183, WTAP_ENCAP_JUNIPER_VP }, + /* USB packets from FreeBSD's USB BPF tap */ + { 186, WTAP_ENCAP_USB_FREEBSD }, /* Bluetooth HCI UART transport (part H:4) frames, like hcidump */ { 187, WTAP_ENCAP_BLUETOOTH_H4 }, /* IEEE 802.16 MAC Common Part Sublayer */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 9cf0f8ab41..73b9f73c55 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -178,13 +178,7 @@ extern "C" { #define WTAP_ENCAP_CATAPULT_DCT2000 89 #define WTAP_ENCAP_BER 90 #define WTAP_ENCAP_JUNIPER_VP 91 -/* - * RESERVED FOR FUTURE USE WITH USB - * NOT GUARANTEED TO CORRESPOND TO THE OLD DEPRECATED LINUX USB - * PSEUDO-HEADER - * DEFINED FOR NOW SOLELY TO MAKE LUA HAPPY - */ -#define WTAP_ENCAP_USB 92 +#define WTAP_ENCAP_USB_FREEBSD 92 #define WTAP_ENCAP_IEEE802_16_MAC_CPS 93 #define WTAP_ENCAP_NETTL_RAW_TELNET 94 #define WTAP_ENCAP_USB_LINUX 95 |