diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-20 11:06:20 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-20 11:06:20 +0000 |
| commit | 43976549ea91a71cd309a585259813b44d9cf492 (patch) | |
| tree | 3d9e1b4a54d1cf6d3fcccadb15147db0d05e9f08 | |
| parent | f681477e333b37a368db10a9960401d46e3a6e37 (diff) | |
From Dejan Bucar (bug 3345):
Added official LINX Ethernet type.
svn path=/trunk/; revision=27804
| -rw-r--r-- | epan/dissectors/packet-linx.c | 5 | ||||
| -rw-r--r-- | epan/etypes.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index a65136f3ba..f1af5d7888 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -43,11 +43,6 @@ #include <epan/packet.h> #include <epan/etypes.h> -#ifndef ETHERTYPE_LINX -/* Ethertype 0x9999 is not reserved at IEEE */ -#define ETHERTYPE_LINX 0x9999 -#endif - /* forward reference */ static void dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); diff --git a/epan/etypes.h b/epan/etypes.h index b419793e56..af6f9fcd9a 100644 --- a/epan/etypes.h +++ b/epan/etypes.h @@ -386,6 +386,10 @@ #define ETHERTYPE_FCOE 0x8906 /* Fibre Channel over Ethernet */ #endif +#ifndef ETHERTYPE_LINX +#define ETHERTYPE_LINX 0x8911 /* ENEA LINX IPC protocol over Ethernet */ +#endif + #ifndef ETHERTYPE_FIP #define ETHERTYPE_FIP 0x8914 /* FCoE Initialization Protocol */ #endif |