121c121
< #define LINKTYPE_TOKEN_RING DLT_IEEE802 /* DLT_IEEE802 is used for Token Ring */
---
> #define LINKTYPE_IEEE802_5 DLT_IEEE802 /* DLT_IEEE802 is used for 802.5 Token Ring */
196,197c196,197
< #define LINKTYPE_PRISM_HEADER 119 /* 802.11+Prism II monitor mode */
< #define LINKTYPE_AIRONET_HEADER 120 /* FreeBSD Aironet driver stuff */
---
> #define LINKTYPE_IEEE802_11_PRISM 119 /* 802.11 plus Prism II monitor mode radio metadata header */
> #define LINKTYPE_IEEE802_11_AIRONET 120 /* 802.11 plus FreeBSD Aironet driver radio metadata header */
215c215
< #define LINKTYPE_IEEE802_11_RADIO 127 /* 802.11 plus BSD radio header */
---
> #define LINKTYPE_IEEE802_11_RADIOTAP 127 /* 802.11 plus radiotap radio metadata header */
310,312d309
< *
< * but could and arguably should also be used by non-AVS Linux
< * 802.11 drivers; that may happen in the future.
314c311
< #define LINKTYPE_IEEE802_11_RADIO_AVS 163 /* 802.11 plus AVS radio header */
---
> #define LINKTYPE_IEEE802_11_AVS 163 /* 802.11 plus AVS radio metadata header */
325c322
< * Reserved for BACnet MS/TP.
---
> * BACnet MS/TP frames.
853c850,855
< #define LINKTYPE_MATCHING_MAX 242 /* highest value in the "matching" range */
---
> /*
> * MPEG-2 transport stream (ISO 13818-1/ITU-T H.222.0).
> *
> * Requested by Guy Martin <gmsoft@tuxicoman.be>.
> */
> #define LINKTYPE_MPEG_2_TS 243
854a857,887
> /*
> * ng4T GmbH's UMTS Iub/Iur-over-ATM and Iub/Iur-over-IP format as
> * used by their ng40 protocol tester.
> *
> * Requested by Jens Grimmer <jens.grimmer@ng4t.com>.
> */
> #define LINKTYPE_NG40 244
>
> /*
> * Pseudo-header giving adapter number and flags, followed by an NFC
> * (Near-Field Communications) Logical Link Control Protocol (LLCP) PDU,
> * as specified by NFC Forum Logical Link Control Protocol Technical
> * Specification LLCP 1.1.
> *
> * Requested by Mike Wakerly <mikey@google.com>.
> */
> #define LINKTYPE_NFC_LLCP 245
>
> /*
> * pfsync output; DLT_PFSYNC is 18, which collides with DLT_CIP in
> * SuSE 6.3, on OpenBSD, NetBSD, DragonFly BSD, and Mac OS X, and
> * is 121, which collides with DLT_HHDLC, in FreeBSD. We pick a
> * shiny new link-layer header type value that doesn't collide with
> * anything, in the hopes that future pfsync savefiles, if any,
> * won't require special hacks to distinguish from other savefiles.
> *
> */
> #define LINKTYPE_PFSYNC 246
>
> #define LINKTYPE_MATCHING_MAX 246 /* highest value in the "matching" range */
>
869c902
< { DLT_IEEE802, LINKTYPE_TOKEN_RING },
---
> { DLT_IEEE802, LINKTYPE_IEEE802_5 },
873a907
> { DLT_SYMANTEC_FIREWALL, LINKTYPE_SYMANTEC_FIREWALL },
886d919
< { DLT_SYMANTEC_FIREWALL, LINKTYPE_SYMANTEC_FIREWALL },
925a959,964
> * Map DLT_PFSYNC, whatever it might be, to LINKTYPE_PFSYNC.
> */
> if (dlt == DLT_PFSYNC)
> return (LINKTYPE_PFSYNC);
>
> /*
952a992,1000
> * Map LINKTYPE_PFSYNC to DLT_PFSYNC, whatever it might be.
> * LINKTYPE_PFSYNC is in the matching range, to make sure
> * it's as safe from reuse as we can arrange, so we do
> * this test first.
> */
> if (linktype == LINKTYPE_PFSYNC)
> return (DLT_PFSYNC);
>
> /*