diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-09-10 18:28:37 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-09-11 01:29:33 +0000 |
| commit | 06584b7a43101dca05f5a3040dbb26898a6c812f (patch) | |
| tree | 7e008b6ad876383cc57678ed71f059cff556181c /epan/etypes.h | |
| parent | 38b40acb2dc2567d3ddda35f4ed7d6523a9a9bd0 (diff) | |
Sort the Ethertypes.
Change-Id: I7793e152da225965817844b727880a26e64051d3
Reviewed-on: https://code.wireshark.org/review/23475
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/etypes.h')
| -rw-r--r-- | epan/etypes.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/epan/etypes.h b/epan/etypes.h index 3e2ca48df0..bbe32aef23 100644 --- a/epan/etypes.h +++ b/epan/etypes.h @@ -537,6 +537,10 @@ extern "C" { #define ETHERTYPE_FIP 0x8914 /* FCoE Initialization Protocol */ #endif +#ifndef ETHERTYPE_ROCE +#define ETHERTYPE_ROCE 0x8915 /* Infiniband RDMA over Converged Ethernet */ +#endif + #ifndef ETHERTYPE_MIH #define ETHERTYPE_MIH 0x8917 /* Media Independent Handover Protocol */ #endif @@ -553,6 +557,10 @@ extern "C" { #define ETHERTYPE_SEL_L2 0x892B /* Schweitzer Engineering Labs Layer 2 */ #endif +#ifndef ETHERTYPE_BLUECOM +#define ETHERTYPE_BLUECOM 0x892D /* Bachmann bluecom protocol */ +#endif + #ifndef ETHERTYPE_HSR #define ETHERTYPE_HSR 0x892F /* High-availability Seamless Redundancy (IEC62439 Part 3) */ #endif @@ -609,15 +617,6 @@ extern "C" { #define ETHERTYPE_FCFT 0xFCFC /* used to transport FC frames+MDS hdr internal to Cisco's MDS switch */ #endif -#ifndef ETHERTYPE_ROCE -#define ETHERTYPE_ROCE 0x8915 /* Infiniband RDMA over Converged Ethernet */ -#endif - -#ifndef ETHERTYPE_BLUECOM -#define ETHERTYPE_BLUECOM 0x892D /* Bachmann bluecom protocol */ -#endif - - WS_DLL_PUBLIC const value_string etype_vals[]; #ifdef __cplusplus |